[PR PATCH] libcgroup: update to 2.0.

[PR PATCH] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]

There is a new pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5244 bytes --]

From ff00b759e5c5773eb6239e2e426ae1a545d5f356 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  2 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..3fcd6a4ea1b8 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -18,5 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
+
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..6089977f8bdc 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/${pkgname}/${pkgname}"
+distfiles="${homepage}/releases/download/v2.0/${pkgname}-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440960

Comment:
why?

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678442933

Comment:
I wouldn't use $homepage and $pkgname. 2.0 should be replaced with $version. tar.gz is prefered over bz2.

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678442250

Comment:
don't use $pkgname in homepage

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440778

Comment:
why?

Re: libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888429401

Comment:
pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5528 bytes --]

From fd00a10bc8dfaed7a8b5f67ec126493f9fab7348 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  5 +--
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (95%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 95%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..3a571281ee93 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -3,8 +3,7 @@ GNU libc's if _GNU_SOURCE is defined.
 
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
-@@ -3332,8 +3332,16 @@
- 
+@@ -3332,4 +3332,12 @@
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +16,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7284d8191462 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457466

Comment:
cp paste creep

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457584

Comment:
cp paste creep

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440778

Comment:
why?

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678440960

Comment:
why?

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678457791

Comment:
pgkname removed from var

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678458184

Comment:
i kept $homepage and $pkgname because it shortens the url quite a bit

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678469976

Comment:
I don't think we have a shortage of bytes.

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678473337

Comment:
it would be nice to keep the 80 column mark as close as possible.

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678474806

Comment:
please revert the changes on patches

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678475784

Comment:
distfiles often go over that mark and that's fine.

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678476681

Comment:
add an empty line between checksum= and case.

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5503 bytes --]

From edbed4e3148844b3708c19a88dd9aa8223a6d2f5 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7284d8191462 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678479050

Comment:
the file has been reverted as in the original

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5530 bytes --]

From 332be86cdf8f0143a5b6f56ae44ab492fd9c6490 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 12 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..7a89ab4b174c 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,18 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678480623

Comment:
distfile now contains full url

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5496 bytes --]

From 581dd8976ed98a521d3f9a69a50a1b9989af2bca Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 11 +++---
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..88e8acc4045b 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR REVIEW] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New review comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678481398

Comment:
added

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888463058

Comment:
> pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.

do you mean the block? 
```
pre_configure() {
  autoreconf -if
}
```

Re: libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888469500

Comment:
> > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> 
> do you mean the block?
> 
> ```
> pre_configure() {
>   autoreconf -if
> }
> ```

yes and you might be able to remove the hostmakedepends variable then

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888472285

Comment:
> > > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> > 
> > 
> > do you mean the block?
> > ```
> > pre_configure() {
> >   autoreconf -if
> > }
> > ```
> 
> yes and you might be able to remove the hostmakedepends variable then

without the pre_configure block it builds fine
but it depends on the hostmakedepends variable

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5683 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 729 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-888600324

Comment:
> > > pre_configure is not necessary, because you use a tarball with pregenerated configure script. The commit message body is not necessary.
> > 
> > yes and you might be able to remove the hostmakedepends variable then
> 
> without the pre_configure block it builds fine
> but it depends on the hostmakedepends variable

sorry, I forgot about flex, we can drop automake and libtool, but have to leave flex there

```
hostmakedepends="flex"
```

Can you also fix the lint issue from CI?

> srcpkgs/libcgroup/template:10: use SPDX id for 'LGPL-2.1' license or see Manual.md

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r678633855

Comment:
Something is wrong, GitHub still shows the change. Are you sure you reverted the changes?

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r682875073

Comment:
don't use $pkgname please

Re: libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-897814476

Comment:
@wibed are you still interested in continuing to work on this PR?

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 243 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-898254086

Comment:
> @wibed are you still interested in continuing to work on this PR?

@paper42 i do, please be patient.

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 5683 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 10695 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/2] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/2] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-900788438

Comment:
@mt3 you just comitted literally when i was to to push my changes upstream

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-900935335

Comment:
@mt3 it seems the checksum should be updated

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691403647

Comment:
this was not solved

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691403647

Comment:
this was not solved

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r691405318

Comment:
this was not solved

sorry for the double comment

Re: libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-901244882

Comment:
> @mt3 it seems the checksum should be updated

yes, that should fix the CI

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 11654 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/3] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/3] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/3] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

Re: [PR REVIEW] libcgroup: update to 2.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#discussion_r692493505

Comment:
let's use tar.gz

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 966424 bytes --]

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 966842 bytes --]

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 1/2] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 2/2] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1933540 bytes --]

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 1/3] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 2/3] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 3/3] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-902355000

Comment:
okey, despise the "no push" commit message. i have reverted the commit back to 2a257f4, because i have committed and pushed from root directory. after that i have rebased to master and pushed up again.

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-902355000

Comment:
okey, despise the "no push" commit message. i have reverted the commit back to 2a257f4, because i have committed and pushed from root directory in 977070c. after that i have rebased to master and pushed up again.

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-902355000

Comment:
okey, despise the "no push" commit message. i have reverted the commit back to 2a257f4, because i have committed and pushed from root directory in 977070c. after that i have rebased to master and pushed again with ef1055f.

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1945195 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/6] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/6] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/6] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/6] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/6] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/6] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-902371213

Comment:
it is getting late

Re: libcgroup: update to 2.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-902792270

Comment:
How are you trying to rebase and squash the commits? We have a lot of comments in PRs here explaining how to do it correctly, if you need the exact commands.

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1946300 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/7] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/7] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/7] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/7] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/7] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/7] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 54ca51742c6b3835d2a709a5770d356b7d8bd15c Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 02:50:48 +0200
Subject: [PATCH 7/7] update to 2.0

---
 srcpkgs/libcgroup/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..d52b837b1c2e 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,9 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 2251592 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 001/823] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From bf8ebed919a49d5fd815cc29d6de60b84e435283 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 27 Jul 2021 23:48:35 +0200
Subject: [PATCH 002/823] harfbuzz: update to 2.8.2.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..106a44ff3139 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From d1dc4cc5affe165ab385a92277e491ce3028f0ea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:52:23 +0200
Subject: [PATCH 003/823] openfortivpn: update to 1.17.0.

---
 srcpkgs/openfortivpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 

From 830b5cf6024b9c44811ae3b045f538501cf2036c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:54:25 +0200
Subject: [PATCH 004/823] openradtool: update to 0.13.8.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 14cf67008c2cf670ae69a87e6e0bd07375aa52c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:30:18 -0500
Subject: [PATCH 005/823] libxlsxwriter: update to 1.1.0.

---
 common/shlibs                  | 2 +-
 srcpkgs/libxlsxwriter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..04eefcdcbdd1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 35bc0ff0173134851df64250bcabdecdcb124282 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:29:52 -0500
Subject: [PATCH 006/823] sc-im: revbump for libxlsxwriter

---
 srcpkgs/sc-im/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 648a81d0aae80af6f2b348567be5386bdc2d9519 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 16:27:33 -0500
Subject: [PATCH 007/823] plantuml: update to 1.2021.9.

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh

From a7e520652eca96541cd717a1ec605648a18df24d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 28 Jul 2021 09:31:18 +0200
Subject: [PATCH 008/823] slack-desktop: update to 4.18.0

Closes: #32225 [via git-merge-pr]
---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes

From 24be999842fbe6eb37d10416728c57faf5df46c7 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Wed, 28 Jul 2021 18:31:25 +0700
Subject: [PATCH 009/823] flameshot: update to 0.10.1

---
 srcpkgs/flameshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9

From 75915800ba3c8a76fc0edb5824d3127883475cf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:44:58 +0200
Subject: [PATCH 010/823] bcc: update to 0.21.0.

---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..5fdf8be098b3 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"

From d0312f1bc0a7f8e60649f3ed3a86dbf60a390f05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:45:58 +0200
Subject: [PATCH 011/823] ipset: update to 7.14.

---
 srcpkgs/ipset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..51150121385d 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.14
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
 
 libipset_package() {
 	short_desc+=" - library files"

From c7ae4c23cc372799cd43739c9a08b907900bb360 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:47:29 +0200
Subject: [PATCH 012/823] nncp: update to 7.5.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..279d6235b763 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.5.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
 
 do_build() {
 	make

From 8f8fcf82af1b641a570d0e41f41bdb51223f6259 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:50:24 +0200
Subject: [PATCH 013/823] perl-PDF-API2: update to 2.041.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..6c50c810c944 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module

From ff36084ae0956c2b89926e9ccab1cf4cb5713ada Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:25 +0200
Subject: [PATCH 014/823] opam: update to 2.1.0.

---
 srcpkgs/opam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 

From 4fa72959cafa46001b94b3be85499d789b098bfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:50 +0200
Subject: [PATCH 015/823] linux5.10: update to 5.10.54.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..2832c9d04add 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.54
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c6bd940d033d86a20dc645a956b4a77dc9173b9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 15:11:02 +0200
Subject: [PATCH 016/823] perl-PDF-API2: fix checksum.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 6c50c810c944..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537

From 0f2a4868ac92d8aa4482d989434fbea8d50bbc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 10:15:44 -0300
Subject: [PATCH 017/823] mdBook: update to 0.4.11.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..49e3264c70be 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.11
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
 
 post_install() {
 	vlicense LICENSE

From 5ae6df447f0f4723ee952c49f13bbbc1f79d4201 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 29 Jul 2021 18:33:03 +0200
Subject: [PATCH 018/823] LuaJIT: switch ppc patches to -p1 (fixes texlive
 build)

---
 .../patches/ppc/musl-ppc-secureplt.patch      | 12 ++---
 .../patches/ppc64/add-ppc64-support.patch     | 48 +++++++++----------
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |  4 +-
 srcpkgs/LuaJIT/template                       |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 

From 251975e3edaa84ca8014edf4a3b3dcae0f0d8502 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 28 Jul 2021 18:30:08 +0200
Subject: [PATCH 019/823] cozy: update to 1.0.4.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..b198300da9a4 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2

From b64df7fa72e80229b80380a6baf53461cb4cc2bc Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 28 Jul 2021 22:26:57 -0500
Subject: [PATCH 020/823] mesa: update to 21.1.6.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..8664f4d799bc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.6
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 584935583d52e61a311c4011af754a0c058b5b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 08:28:17 +0200
Subject: [PATCH 021/823] postfix: update to 3.6.2.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..4dc1b9e5dad8 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
+version=3.6.2
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 2beff1801b36b5e34dbe54c3ee82623aeb79b0c2 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <dominic@dominic.io>
Date: Thu, 29 Jul 2021 10:17:20 +0100
Subject: [PATCH 022/823] clojure: update to 1.10.3.933.

---
 srcpkgs/clojure/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure

From ea798d1d800dcef686b456aa43d6bbb9ad9b9da2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:13:46 +0200
Subject: [PATCH 023/823] linux5.4: update to 5.4.136.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..4fd63332b5c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.136
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From de666e86ddf53c919cc017561be7ece833d0de45 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:20:36 +0200
Subject: [PATCH 024/823] linux4.19: update to 4.19.199.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..a6e4f5a686b2 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.199
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4a99bde93b38c191d33fff12dd66485fb6cb7ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 16:00:15 -0300
Subject: [PATCH 025/823] yambar: fix launching with --backend=wayland.

Fixes: #32248.
---
 .../yambar/patches/0001-bar-fix-typo.patch    | 27 +++++++++++++++++++
 srcpkgs/yambar/template                       |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"

From d0113f34e8ec82bfd748c95c7c66d97be6bc542e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:07:32 +0200
Subject: [PATCH 026/823] isync: update to 1.4.3.

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From cd10a1791ec25645b7493324b05342feb334a3c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:09:51 +0200
Subject: [PATCH 027/823] xorg-server: update to 1.20.13.

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From c74c393167b226b8d5bbabb7cca7645ca8d247b8 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 30 Jul 2021 07:02:48 +0200
Subject: [PATCH 028/823] python3-pikepdf: update to 2.16.1.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From e3e508821f2bb1497d37e5f383475878c506c26e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:55:08 +0300
Subject: [PATCH 029/823] sublime-merge-bin: update to 2059.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 5641313fd32510cc7f521eb3aa78092249527b08 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:39:19 +0300
Subject: [PATCH 030/823] notcurses: update to 2.3.12.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..4b3563f65ffc 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.12
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 4876e6e11574697733cf09433c8c4c5e22c7158b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:28:22 +0300
Subject: [PATCH 031/823] skype: update to 8.74.0.152.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..d8e2f3a77606 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.74.0.152
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
 repository="nonfree"
 nostrip="yes"
 

From cf155a52e7e16d38b5a9f335fc9c6fa880c90459 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jul 2021 08:35:40 +0200
Subject: [PATCH 032/823] pp: update to 1.0.9.

---
 srcpkgs/pp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2dd28af4c82f5d7b459f388636dfde6c3b3cc820 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 27 Jul 2021 12:12:28 -0700
Subject: [PATCH 033/823] OpenRCT2: update to 0.3.4.1

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..761da7f1e580 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
+version=0.3.4.1
 revision=1
 build_style=cmake
 configure_args="
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"

From 0aed85bdb32a1c29c8c5bd33f91b431620ae2486 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 21:05:15 +0300
Subject: [PATCH 034/823] mbedtls: update to 2.16.11.

---
 srcpkgs/mbedtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C

From 2c7ebe686e6539d65d3e64b4eb0c16b5e3544911 Mon Sep 17 00:00:00 2001
From: boson-at <boson@gmx.at>
Date: Fri, 30 Jul 2021 06:16:56 +0200
Subject: [PATCH 035/823] osm2pgsql: update to 1.5.1.

---
 srcpkgs/osm2pgsql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e

From 894908b71b0342b1d3fa3709a0010cd5a2130a81 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 036/823] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From f0478f19b9c72c29ef01de96496177a9d2bc95b7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 037/823] plasma-workspace: revbump for libqalculate.so.22

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel

From 4aedc78b57437bccebfb2655ad2da8538168ad92 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 038/823] qalculate-gtk: update to 3.20.1

---
 srcpkgs/qalculate-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..f71c085f5e8a 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 730d52125fc8942128d1e15c5cd72bc97eccb141 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 039/823] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

From b83d25247b20e2063d28c05516882c1dea443938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Jul 2021 17:06:48 -0300
Subject: [PATCH 040/823] util-linux: backport fix for su(1).

Since trusting PAM_RUSER is left to administrators, make sure it can be
trusted if necessary.
---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..41bffc545884 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 7bccf7fad7e63a457812157856c53e95bf5c606c Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 30 Jul 2021 17:41:13 -0600
Subject: [PATCH 041/823] mu: update to 1.6.1

---
 srcpkgs/mu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 6e5e816b5ca9..36d67ef65cba 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,16 +1,16 @@
 # Template file for 'mu'
 pkgname=mu
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
 
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" emacs"

From 00a8dd3e694f8b884b0a1c132f441765228d19fa Mon Sep 17 00:00:00 2001
From: jailbird777 <jailbird@fdf.net>
Date: Mon, 26 Jul 2021 19:11:45 -0500
Subject: [PATCH 042/823] New package: dnsdist-1.6.0

---
 srcpkgs/dnsdist/files/dnsdist/run |  4 ++++
 srcpkgs/dnsdist/template          | 36 +++++++++++++++++++++++++++++++
 srcpkgs/dnsdist/update            |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update

diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"

From 2e448c405e2cce6c4a8089cca243d791df0d6b49 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 27 Jul 2021 11:36:40 +0200
Subject: [PATCH 043/823] libX11: patch for new symbols

Apply upstream merge request to handle the new _EVDEVK xorgproto symbols,
so that xkbcomp does not generate hundreds of warnings.
See https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79
---
 .../handle_new_xorgproto_symbols.patch        | 42 +++++++++++++++++++
 srcpkgs/libX11/template                       |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch

diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From 476583c474bc04e927239615104130bb6fcb3a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 23 Jul 2021 12:24:43 +0000
Subject: [PATCH 044/823] dnscrypt-proxy: fix logging (redirect stderr to
 svlogd).

---
 srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run | 1 +
 srcpkgs/dnscrypt-proxy/template                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"

From 53c7116b9a63e71269449b66415807de0ed0f6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gerdau?= <bjoerngerdau@gmx.de>
Date: Wed, 21 Jul 2021 22:21:23 +0200
Subject: [PATCH 045/823] kubernetes: update to 1.21.3.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..08d2f27b3859 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 805cb4f9eb1b8ba71c64c38ef85d8ac43d99cf4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 31 Jul 2021 12:05:35 +0700
Subject: [PATCH 046/823] cryfs: build with NDEBUG defined

Close: #32266
---
 srcpkgs/cryfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..6d8f855a80af 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel

From 58c88407e18253ac9d27fe208e1dc6843ca59b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Wed, 28 Jul 2021 22:15:51 +0000
Subject: [PATCH 047/823] tailscale: update to 1.12.1.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE

From 1031b03e01d8e1b82244b88cbd317895651c2c3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jul 2021 16:56:57 +0200
Subject: [PATCH 048/823] knot-resolver: update to 5.4.0.

---
 srcpkgs/knot-resolver/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..b07a400a3a02 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
+version=5.4.0
 revision=1
 build_style=meson
 configure_args="
@@ -8,17 +8,18 @@ configure_args="
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From f9e2bddbcb5f3cc2ad3366c55ae9017e8b6854a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 31 Jul 2021 14:31:05 +0200
Subject: [PATCH 049/823] monit: update to 5.28.1.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap

From 26708d26b89093c61ec10887f0c38382fcf16ddd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 31 Jul 2021 16:49:34 -0500
Subject: [PATCH 050/823] hivex: update to 1.3.20.

---
 srcpkgs/hivex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..1ed578d92e17 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.20
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
 nocross=yes

From 1f2aa9d964d19080e49d9a4a4ca41e91269fb554 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 31 Jul 2021 22:40:39 +0200
Subject: [PATCH 051/823] webkit2gtk: add more BE fixes

---
 .../patches/be-imagebufferbackend.patch       | 214 ++++++++++++++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++++
 2 files changed, 262 insertions(+)
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2

From fe9051867433b91e17128ac090c3f6fa8cb642aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:57 +0200
Subject: [PATCH 052/823] bluedevil: update to 5.22.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 4182e1a5ba8b0c7219cb689e7ff2e240efc14f04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:59 +0200
Subject: [PATCH 053/823] breeze-gtk: update to 5.22.4.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 297a08aceddc5530b360214508f304572c515c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:06 +0200
Subject: [PATCH 054/823] breeze: update to 5.22.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 065852826ab37f6dc77c4459158ad107978be922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:07 +0200
Subject: [PATCH 055/823] kactivitymanagerd: update to 5.22.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce

From 1810152e1f56df634ec6ae3d7e0febe0c9d5bad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:09 +0200
Subject: [PATCH 056/823] kde-cli-tools: update to 5.22.4.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 820bddb8cc52202608785b2db5aabdd0f930d862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:10 +0200
Subject: [PATCH 057/823] kde-gtk-config5: update to 5.22.4.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c18bf9893294ea60ca77fd5f8091a254873fd1d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:12 +0200
Subject: [PATCH 058/823] kdecoration: update to 5.22.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 0a88170a2ae49b69e48816588f695e6dd2820336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:13 +0200
Subject: [PATCH 059/823] kdeplasma-addons5: update to 5.22.4.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2b7dd6ecc4075a5601f02cc9c4a89e87a50f782b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:14 +0200
Subject: [PATCH 060/823] kgamma5: update to 5.22.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From e17b6f51d05bb5c53761e6fdd7ef65297d51d172 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:16 +0200
Subject: [PATCH 061/823] khotkeys: update to 5.22.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 3e67029160dfb48ed668c2e1601783bf89816da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:18 +0200
Subject: [PATCH 062/823] kinfocenter: update to 5.22.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 32235fde4742bf035d801c9746f69e0209552901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:19 +0200
Subject: [PATCH 063/823] kmenuedit: update to 5.22.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0

From 79997e03280ecf8d42125336f8a84daf9dc5f43a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:21 +0200
Subject: [PATCH 064/823] kscreen: update to 5.22.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f6294bce6eb9994211ce9e182650009f9aa11342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:22 +0200
Subject: [PATCH 065/823] kscreenlocker: update to 5.22.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 18e1026487399c3a7a2ce79ebd323fa7e9dff88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:24 +0200
Subject: [PATCH 066/823] ksshaskpass: update to 5.22.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 6fc37d84520d82cfe038da0104f5bf686f0dd5cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:25 +0200
Subject: [PATCH 067/823] ksystemstats: update to 5.22.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5

From 5063d1ccd837452ece28451f0576a3e1f5732dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:27 +0200
Subject: [PATCH 068/823] kwallet-pam: update to 5.22.4.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2

From 4420f4e96772b059ca1c048c75a707ecb999faa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:28 +0200
Subject: [PATCH 069/823] kwayland-integration: update to 5.22.4.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e

From 4b5d44cc010f11f556c0d2f986e13840f8e58d92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:29 +0200
Subject: [PATCH 070/823] kwayland-server: update to 5.22.4.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 873c60b97358cc9c08bbdf7e8362b80ad29a3db1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:32 +0200
Subject: [PATCH 071/823] kwin: update to 5.22.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"

From 9730118279df11c3ad8b96453db3aa6c302ce905 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:33 +0200
Subject: [PATCH 072/823] kwrited: update to 5.22.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5

From 55f428cce7515cc770eea2afbd4eb38ab16f5b24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:34 +0200
Subject: [PATCH 073/823] layer-shell-qt: update to 5.22.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 84946bf3d38186226c8b81344d95766f85ba6524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:36 +0200
Subject: [PATCH 074/823] libkscreen: update to 5.22.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 5085c2ec9257a08225b717d1e269ab37869da23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:37 +0200
Subject: [PATCH 075/823] libksysguard: update to 5.22.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 

From 71de4a03f8957eac88eba1c4ae5a951c6d14dca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:39 +0200
Subject: [PATCH 076/823] milou: update to 5.22.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3dcb3abae554c9a06305c53bc35c5385856e3e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:41 +0200
Subject: [PATCH 077/823] oxygen: update to 5.22.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc

From 825dc137b137b77093966e2cbd14c5073dd73cb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:42 +0200
Subject: [PATCH 078/823] plasma-browser-integration: update to 5.22.4.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From ee40aaeb90ea53724c7294666882c40e99722dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:46 +0200
Subject: [PATCH 079/823] plasma-desktop: update to 5.22.4.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3

From 17e9e849ea0e6d943d92397aeb10d3a896950175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:47 +0200
Subject: [PATCH 080/823] plasma-disks: update to 5.22.4.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909

From 521bfe3f92aea3574ca1e0b1a0ffc0c87447dd00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:49 +0200
Subject: [PATCH 081/823] plasma-firewall: update to 5.22.4.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0

From d8dfb12795b9285894034050838d4a72a3ace9ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:50 +0200
Subject: [PATCH 082/823] plasma-integration: update to 5.22.4.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467

From 0f0aaa92d4b504cde54e6fd1bfe958af1effc927 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:52 +0200
Subject: [PATCH 083/823] plasma-nm: update to 5.22.4.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5b7986e96346b51e8d4174a9dfc70257e3d0a6ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:53 +0200
Subject: [PATCH 084/823] plasma-pa: update to 5.22.4.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 700491832bd8de34062a175405b5ffef4f65220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:55 +0200
Subject: [PATCH 085/823] plasma-sdk: update to 5.22.4.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 13fd1f8b3ab81f3a914635556bd5d57fe08d0c9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:56 +0200
Subject: [PATCH 086/823] plasma-systemmonitor: update to 5.22.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be

From 6963498c213b686efecea6ff90f5bf17994a7acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:58 +0200
Subject: [PATCH 087/823] plasma-thunderbolt: update to 5.22.4.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services

From 75173d470aff372c2a12b990fcfa08d7358e7720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:59 +0200
Subject: [PATCH 088/823] plasma-vault: update to 5.22.4.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 1b19a5acce520117cdc1efa3a75860e7fe3e40fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:08 +0200
Subject: [PATCH 089/823] plasma-workspace-wallpapers: update to 5.22.4.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29

From 62e4fe155ea27782c39682c8cdeac0377a343e67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:11 +0200
Subject: [PATCH 090/823] plasma-workspace: update to 5.22.4.

---
 srcpkgs/plasma-workspace/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index fa84666b06fb..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
-revision=2
+version=5.22.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"

From b9bddaf4fc50f89a4abe42162a3d75a9f4353e09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:12 +0200
Subject: [PATCH 091/823] polkit-kde-agent: update to 5.22.4.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f

From 958ad12c4c1086f4c9261f620cbb5701fba03821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:15 +0200
Subject: [PATCH 092/823] powerdevil: update to 5.22.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c

From 355ae4cb66d20393c952b25861521ce849dce34c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:16 +0200
Subject: [PATCH 093/823] sddm-kcm: update to 5.22.4.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022

From 1689a7936293ec4f122162aad2a822be190dedf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:17 +0200
Subject: [PATCH 094/823] systemsettings: update to 5.22.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa

From 759bf77cc98e1609c69ab8930be71ab4a8bd5cfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:19 +0200
Subject: [PATCH 095/823] xdg-desktop-portal-kde: update to 5.22.4.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6

From 578e8752ad5822e14608fd754cb628aa2f8623d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:09 -0400
Subject: [PATCH 096/823] python3-aioredis: update to 2.0.0.

---
 srcpkgs/python3-aioredis/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE

From 87dd6c58f9b89ed34e4dc2a90e39cc711167ff61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:49 -0400
Subject: [PATCH 097/823] python3-flit_core: update to 3.3.0.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE

From 191519639e496b89c0a9632d5b8c738054f61aa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:44:39 -0400
Subject: [PATCH 098/823] python3-pip: update to 21.2.2.

---
 .../patches/no-versioned-pip.patch            | 19 ++++++++++---------
 srcpkgs/python3-pip/template                  |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..b07a3022fe14 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,11 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+@@ -67,9 +67,7 @@
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..3e800139d4da 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.2
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
 # Tests have unpackaged dependencies
 make_check=no
 

From 4ecf8b8a4e5f6791b0d38896c37b426c8c8a8fa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:55:47 -0400
Subject: [PATCH 099/823] python3-tifffile: update to 2021.7.30.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..0e9e467e1564 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.7.30
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
 # Tests require unpackaged fsspec
 make_check=no
 

From 98de8e3b3105dd94ab6c3c2fe071e3503547d031 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 28 Jul 2021 20:04:41 +0300
Subject: [PATCH 100/823] qutebrowser: update to 2.3.1

Closes: #32236 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From 755ebf64fa93f646b9444906272f0b944b3a8713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 1 Aug 2021 03:03:31 +0200
Subject: [PATCH 101/823] kubernetes: fix build

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 08d2f27b3859..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh

From f1352aeba3d93eb58235e06091768ced9dee31d0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:45:54 +0200
Subject: [PATCH 102/823] wine: update to 6.14.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..30be01e169b2 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.14/dlls/dnsapi/libresolv.c
++++ b/wine-6.14/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..bb2fa789c7e7 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.14
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
+ 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 82d9b2bf941dcc859ac3414cb5ceac4768e7f4e9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:47:38 +0200
Subject: [PATCH 103/823] wine-mono: update to 6.3.0.

---
 srcpkgs/wine-mono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 3436c69dd25a5964cdf9b666e9d1a2653b5be4fd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:50:34 +0200
Subject: [PATCH 104/823] linux5.4: update to 5.4.137.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 4fd63332b5c9..807b6b49c848 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.136
+version=5.4.137
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
+checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 846a9d9602b827a11a539dfe9463d80cd019cd80 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:53:39 +0200
Subject: [PATCH 105/823] linux4.19: update to 4.19.200.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a6e4f5a686b2..1962af9c6030 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.199
+version=4.19.200
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
+checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 658962505a222a3e828777a850caddd32900e62c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:46:12 +0200
Subject: [PATCH 106/823] python3-pyinfra: update to 1.4.11.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..b7c5bebb3e56 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.11
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 7b2ab0e7fb9c1022d0ac7c15a0d13dde9ac0cc17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:48:08 +0200
Subject: [PATCH 107/823] sleuthkit: update to 4.11.0.

---
 srcpkgs/sleuthkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

From 63599059d0f13b19b36b3e4805974fc86f7c3d33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:50:43 +0200
Subject: [PATCH 108/823] sbcl: update to 2.1.7.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 6b47f1aff805e83d69d7cd981bd71989db748ede Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 16:59:09 +0200
Subject: [PATCH 109/823] hugo: update to 0.86.1.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..03cdeb450eae 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.86.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
 
 post_install() {
 	vdoc README.md

From 80539eb4856eb564986a59837ab587b18236fc8e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 17:03:26 +0200
Subject: [PATCH 110/823] freeplane: update to 1.9.7.

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 4c15a7022daffc1de7e98bb12ef93d4bfe196f71 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 1 Aug 2021 19:54:29 +0200
Subject: [PATCH 111/823] shfmt: update to 3.3.1.

Closes: #32290 [via git-merge-pr]
---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 8180bbd08443aa4acd6a15c5c6408239afb27112 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:30:05 +0200
Subject: [PATCH 112/823] sfeed: update to 0.9.25.

Closes: #32287 [via git-merge-pr]
---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..9f3d23098319 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
 
 post_install() {
 	vlicense LICENSE

From 7b14cce382cf4eba02064a324ce758999122e407 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 1 Aug 2021 00:44:56 +0300
Subject: [PATCH 113/823] mousepad: update to 0.5.6.

Also:
- replace gtksourceview-devel with gtksourceview4-devel in makedepends.

Closes: #32277 [via git-merge-pr]
---
 srcpkgs/mousepad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f

From 01f6ee69649b02cfe46f5d7850d3f3a8d9b62e80 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 31 Jul 2021 19:23:50 +0200
Subject: [PATCH 114/823] s: update to 0.5.16.

Closes: #32271 [via git-merge-pr]
---
 srcpkgs/s/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE

From 0af2b4c515fbd6e58113fadf2f0c6091f569416b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:50:40 +0300
Subject: [PATCH 115/823] python3-distro: update to 1.6.0.

Also:
- add checkdepends to enable tests.

Closes: #32260 [via git-merge-pr]
---
 srcpkgs/python3-distro/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424

From dc8f929dfbc90fd31717cc1df8be050610a9b99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 18:06:38 +0200
Subject: [PATCH 116/823] tickr: update to 0.7.1.

Closes: #32247 [via git-merge-pr]
---
 srcpkgs/tickr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;

From 70d8435c0f0c224e1dc9ba096cd928faf0dc51e8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:47:34 +0200
Subject: [PATCH 117/823] python3-pyrsistent: update to 0.18

---
 srcpkgs/python3-pyrsistent/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {

From 7ba6e9a9a3934f9cb326e7c7060693c2f6cbb422 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:50:00 +0200
Subject: [PATCH 118/823] python3-jupyterlab_server: update to 2.6.1

---
 srcpkgs/python3-jupyterlab_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 

From 30aa5752c8009815df56229c6523a3d59fbf99b0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:51:27 +0200
Subject: [PATCH 119/823] python3-jupyter_server: update to 1.10.1

---
 srcpkgs/python3-jupyter_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 

From 4d9261d3aa412f7f31e5f61ecb288d1304ff3be7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:52:59 +0200
Subject: [PATCH 120/823] python3-json5: update to 0.9.6

---
 srcpkgs/python3-json5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c

From 05d3902453902619fb1bc887e99df60858368a95 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:54:15 +0200
Subject: [PATCH 121/823] python3-anyio: update to 3.3.0

---
 srcpkgs/python3-anyio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {

From 8b968948196d1d8b308d59f1750d5d37c2e78087 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:55:45 +0200
Subject: [PATCH 122/823] jupyterlab: update to 3.1.0, add deps

Closes: #32235 [via git-merge-pr]
---
 srcpkgs/jupyterlab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 

From be6ed42fb8fe6b2747a97b5c28883ef55109a610 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:22:05 +0200
Subject: [PATCH 123/823] xeyes: update to 1.2.0.

---
 srcpkgs/xeyes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..64ff5042d9d0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,6 +1,6 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING

From 3d2469e246a4bd6ac2e471958f16eea5764877b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:28:00 +0200
Subject: [PATCH 124/823] re2c: update to 2.2.

---
 srcpkgs/re2c/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda

From 7b6e26ca542d6d307a6fb85785b648104bc21568 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 16:34:37 +0200
Subject: [PATCH 125/823] xwd: update to 1.0.8.

Adopt.
---
 srcpkgs/xwd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING

From 2942652d4ce85856fcccb6318d23f139cea783a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Aug 2021 16:31:23 +0200
Subject: [PATCH 126/823] icdiff: update to 2.0.3.

---
 srcpkgs/icdiff/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..3af6dfdcd074 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.3
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }

From a6391eb478911a2ce0fc6cb915fe85bc5c1ac403 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 19:58:04 +0200
Subject: [PATCH 127/823] libvirt: update to 7.6.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 6ed854b7128a7db84bce534376afae41923dc784 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:00:31 +0200
Subject: [PATCH 128/823] libvirt-python3: update to 7.6.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e

From 62a3709b1bc9e11d1d999f042cbc590ab2b6d695 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:04:19 +0200
Subject: [PATCH 129/823] xeyes: add libXi-devel to makedepends

---
 srcpkgs/xeyes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 64ff5042d9d0..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"

From 7f3c99b517e78f6f95b15adbc1421942c842bb18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 19:37:54 +0200
Subject: [PATCH 130/823] tg_owt: rebuild to fix a segfault

I'm not sure what exactly caused it or what causes it,
the segfault did not happen in gdb,
instead telegram just exited normally
---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9

From 4e76ca0b13e87610b180d5b31312f19bd610a3b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:01:58 +0200
Subject: [PATCH 131/823] telegram-desktop: update to 2.9.0.

closes #32111
---
 .../0003-remove-redundant-extern-c.patch      | 28 -------------------
 srcpkgs/telegram-desktop/template             |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch

diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 42950e423afdf403db04b4df9ec0588f75b3ef00 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 22:05:48 +0200
Subject: [PATCH 132/823] musl: backport patches to fix pthread_cond_wait with
 PI mutex

https://github.com/pulseaudio/pulseaudio/blob/master/src/pulsecore/mutex-posix.c#L55
https://github.com/pulseaudio/pulseaudio/blob/master/src/pulse/thread-mainloop.c#L118

https://github.com/pulseaudio/pulseaudio/commit/413a8f8917256ef44a58fc8519bcc93644423373

pulseaudio uses a prio-inheriting mutex since the above revision
that is paised with a condition variable; the behavior of this
was broken in musl until the above patches, which would result
in pulseaudio deadlocking with gstreamer pulsesink (most often
with webkit) and possibly other things.

Fixes https://github.com/void-linux/void-packages/issues/15631
---
 .../musl/patches/fix-pi-mutex-cond-1.patch    | 56 +++++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-2.patch    | 48 ++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-3.patch    | 28 ++++++++++
 srcpkgs/musl/template                         |  2 +-
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch

diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 526a182d9bdef4401c176e47ace0133356d2732a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 31 Jul 2021 02:14:55 -0300
Subject: [PATCH 133/823] bcc: (actually) update to 0.21.0.

The unversioned file name means we can accidentally fool the distfiles
cache, so the package was built with the wrong distfiles.

We avoid this issue in the future by renaming the file to one that
contains the version.
---
 srcpkgs/bcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5fdf8be098b3..5a3e66c86c5d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
+checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2b855e52fcc047dd9eb994688931c0f2b913da81 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:53:58 +0200
Subject: [PATCH 134/823] scrot: update to 1.6.

---
 srcpkgs/scrot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh

From bb8b54a3e3efc51480c6dab404451e2738b38c77 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:52:54 +0200
Subject: [PATCH 135/823] libmbim: update to 1.26.0.

---
 srcpkgs/libmbim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"

From e9d8d473ecad40e9d28c0997d691a108f5e995ae Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 25 Jul 2021 11:15:46 +0200
Subject: [PATCH 136/823] New package: shiori-1.5.0

---
 srcpkgs/shiori/files/shiori/run |  4 ++++
 srcpkgs/shiori/template         | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template

diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}

From 18c5ca6f8beb6a38f6c33af60e1951a29e92fc5e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 23:20:05 +0200
Subject: [PATCH 137/823] bcc: use an updated libbpf to fix build on 32-bit
 systems

---
 srcpkgs/bcc/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5a3e66c86c5d..c2b7a65c19fd 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=2
+revision=3
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"

From 12f79a6f3336a2e177c02964fcd245bafd8d1e34 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 15 Aug 2020 20:57:51 +1000
Subject: [PATCH 138/823] New package : python3-RPi.GPIO-0.7.0

---
 srcpkgs/python3-RPi.GPIO/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-RPi.GPIO/template

diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}

From 8822f15cbcd902c3e5ec7c755817dd77e5b40227 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 27 Jul 2021 08:38:10 +0200
Subject: [PATCH 139/823] sslh: add patch to work with libconfig 1.7.3

---
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 2 files changed, 713 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch

diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"

From 5c81bc718b3870c4d24fa28614ee7b5d00d21866 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:38:13 +0300
Subject: [PATCH 140/823] perl-Test-Needs: update to 0.002009.

---
 srcpkgs/perl-Test-Needs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3

From bfed1bb164fed35c7e5233389f5a0ad79860a502 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:24:26 +0300
Subject: [PATCH 141/823] perl-URI: update to 5.09.

---
 srcpkgs/perl-URI/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a

From 74fb046938787094372ec43b172c780cc43fe513 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:32:02 +0200
Subject: [PATCH 142/823] sfeed_curses: update to 0.9.13.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..148f3d67f824 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=0.9.13
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
 
 post_install() {
 	vlicense LICENSE

From abd3eb5932a75b982333318bc931cfac3b22b2a4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 1 Aug 2021 09:57:54 +0200
Subject: [PATCH 143/823] mkvtoolnix: update to 60.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0875991a872f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
+version=60.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 8492465cca7202e829fd4fa2094305176d4b82f6 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 1 Aug 2021 16:10:52 +1000
Subject: [PATCH 144/823] saml2aws: update to 2.32.0

---
 srcpkgs/saml2aws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md

From ee2e4b417df573312513c4b029ffe0ded5424a16 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 31 Jul 2021 14:49:30 -0300
Subject: [PATCH 145/823] imlib2: update to 1.7.2.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING

From d79d51133a7795c30ce91c1193d7a69ef5acb05a Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Mon, 2 Aug 2021 11:47:58 -0500
Subject: [PATCH 146/823] protonvpn-cli: update to 2.2.11.

---
 srcpkgs/protonvpn-cli/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..c9a3c784ace6 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,8 +1,8 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
+version=2.2.11
 revision=1
-wrksrc="linux-cli-${version}"
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
@@ -11,5 +11,6 @@ short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks

From 4c65424e746058006221c2cf1b1e804eb9f29745 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Aug 2021 13:45:28 +0200
Subject: [PATCH 147/823] dbeaver: update to 21.1.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..b5ae64ae7d74 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
 nopie=true
 
 do_build() {

From 7709c4a46e3bd26c0c3dca7c3eef66779e95a56f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Fri, 30 Jul 2021 11:55:26 +0300
Subject: [PATCH 148/823] emptty: update to 0.6.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 76259b34714cd32f6b3af9126e82866244143fc4 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Fri, 30 Jul 2021 20:14:00 -0400
Subject: [PATCH 149/823] synapse: update to 1.39.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..b45f32817bdf 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.39.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From eebd0dd6ef328be609125345f6b68d78a8da8753 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Jul 2021 18:35:41 +0300
Subject: [PATCH 150/823] btrfs-progs: update to 5.13.1

---
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch | 56 -------------------
 srcpkgs/btrfs-progs/template                  |  6 +-
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch

diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

From bb937e8516359f896d906a54eb5f189974ee367a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 21 Jul 2021 14:11:56 +0200
Subject: [PATCH 151/823] rpi-imager: update to 1.6.2.

---
 srcpkgs/rpi-imager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 8158b933384153d954c94578c8d3c4a0f600ad96 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Wed, 21 Jul 2021 11:59:41 -0700
Subject: [PATCH 152/823] zola: update to 0.14.0

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From da39ce8d105103e65958ba2d1f541472f2f0de1b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 17:52:41 +0300
Subject: [PATCH 153/823] dialog: update to 1.3.20210621.

---
 srcpkgs/dialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib

From a286d255e4c156b37ca823fe5d3db29b062e363f Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Thu, 29 Jul 2021 16:04:06 +0600
Subject: [PATCH 154/823] crun: update to 0.21.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From f45e582f9ae21b82224ec627bbc3355d06d28f4c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 29 Jul 2021 19:51:53 +0000
Subject: [PATCH 155/823] strace: update to 5.13.

---
 srcpkgs/strace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"

From 8e78b7ffc1c6c47e04198edbd95ab57e2d8cf8af Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 1 Aug 2021 11:52:23 +0300
Subject: [PATCH 156/823] vc: update to 1.4.2.

---
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch | 31 +++++++++++++++++++
 srcpkgs/vc/template                           |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch

diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE

From 87f90aaaaaf0b8aeb77de6a9434f98868f0dbb15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:43:50 +0200
Subject: [PATCH 157/823] neatvi: update to 09.

---
 srcpkgs/neatvi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex

From a63d20a6891426469e0c2f5f553a07cc0fa8dda8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:44:49 +0200
Subject: [PATCH 158/823] skaffold: update to 1.29.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..663f97e1f5f0 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.29.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046

From 751bab7ffff3012dcf4bd87f8b0f86263a5c8ce0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:45:35 +0200
Subject: [PATCH 159/823] byacc: update to 20210802.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..db54998f0f25 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210802
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 12130e2bf2e4e0c2a624fec021272bf4552c7a5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:46:11 +0200
Subject: [PATCH 160/823] minify: update to 2.9.21.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE

From ce36ce06f777aba0413bf268523fe8d0064a37b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:49:15 +0200
Subject: [PATCH 161/823] stress-ng: update to 0.13.00.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd

From d946fa51e2e5208dc9fc3c82854cb07cbd6a7d86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:53:16 +0200
Subject: [PATCH 162/823] crawl: update to 0.27.0.

---
 srcpkgs/crawl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 66e60f98d0f9acec997eed53e4db6c10dc8e5ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:55:47 +0200
Subject: [PATCH 163/823] crawl-tiles: update to 0.27.0.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 7a7362867fee3361e82a713d53f421d620ce8f40 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 14:52:47 +0200
Subject: [PATCH 164/823] syncthing: update to 1.18.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \

From 5054eeb32fd32539b2841303467316c079f219b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:41:20 -0400
Subject: [PATCH 165/823] python3-scipy: update to 1.7.1.

---
 srcpkgs/python3-scipy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 

From bbfb3428f692c64c9023ba0ae2c4273dd3e4013e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:42:34 -0400
Subject: [PATCH 166/823] python3-ipython: update to 7.26.0.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 9f8c9e8acad8cde2c0f61481fee1ea36ef7afc3c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 3 Aug 2021 17:42:05 +0200
Subject: [PATCH 167/823] warzone2100: update to 4.1.2.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..d878605ff26a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.2
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 1b02a7875d62626de377db501d29e03a5460e3d3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 18:02:07 +0200
Subject: [PATCH 168/823] restic: update to 0.12.1.

---
 srcpkgs/restic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE

From b22b739d19e707b0801065ca0c813a3f4ea9bbe5 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 3 Aug 2021 13:50:11 +0200
Subject: [PATCH 169/823] vips: update to 8.11.2.

---
 srcpkgs/vips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"

From b6a3541047198e846495fe5800601ce71d5a9307 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 3 Aug 2021 13:06:35 +0200
Subject: [PATCH 170/823] google-chrome: update to 92.0.4515.131

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 4f0f4ff21a2e9fccb65935d9dc8d6b34491db428 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:21 +0200
Subject: [PATCH 171/823] knot: update to 3.1.0.

---
 common/shlibs         | 4 ++--
 srcpkgs/knot/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index da24f1de5810..f768a637aed5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3678,9 +3678,9 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
 libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..2188e92dac8b 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From c705c309f06982619f4cf87eee6131b5aee801f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:57 +0200
Subject: [PATCH 172/823] knot-resolver: rebuild against knot-3.1.0_1

---
 srcpkgs/knot-resolver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b07a400a3a02..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
 version=5.4.0
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled

From 3af8ef01c784b1ec70b76589ed95c856e1b1e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 3 Aug 2021 20:36:16 +0200
Subject: [PATCH 173/823] firefox-i18n: update to 90.0.1.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..d1526dfa7ba1 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
+ 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
+ a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
+ 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
+ ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
+ 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
+ d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
+ ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
+ 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
+ ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
+ 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
+ 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
+ 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
+ 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
+ bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
+ 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
+ e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
+ cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
+ 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
+ df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
+ 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
+ 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
+ cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
+ dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
+ 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
+ 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
+ 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
+ c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
+ b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
+ 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
+ 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
+ b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
+ 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
+ e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
+ 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
+ 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
+ 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
+ e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
+ 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
+ befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
+ e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
+ 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
+ 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
+ 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
+ ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
+ d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
+ f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
+ 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
+ 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
+ db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
+ a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
+ d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
+ fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
+ c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
+ a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
+ a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
+ c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
+ b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
+ 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
+ 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
+ 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
+ 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
+ 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
+ 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
+ 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
+ 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
+ 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
+ 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
+ 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
+ a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
+ b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
+ 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
+ a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
+ a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
+ cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
+ dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
+ 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
+ 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
+ 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
+ b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
+ 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
+ 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
+ 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
+ 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
+ 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
+ c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
+ f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
+ e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
+ e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
+ 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
+ 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
+ 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
+ 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
+ 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
+ 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
+ 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"

From eb18dda697776e74fb93e4d0903ea24a6dff83fa Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 2 Aug 2021 09:09:50 +0300
Subject: [PATCH 174/823] khal: update to 0.10.4.

---
 srcpkgs/khal/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \

From c953a74395992461d1273e5463849a873109a39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 3 Aug 2021 18:29:40 -0300
Subject: [PATCH 175/823] util-linux: backport sulogin(8) fix.

sulogin wasn't actually logging in, making single user mode useless.

Reported by kciN on IRC.
---
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 41bffc545884..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From aa3de6857265bff30ec3dba020c880763fba7b18 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 31 Jul 2021 19:57:01 +0200
Subject: [PATCH 176/823] python3-astroid: update to 2.6.5, adopt

---
 srcpkgs/python3-astroid/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7

From 041a71e4789318e861d934139d62ee4da01420d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Aug 2021 00:10:46 +0200
Subject: [PATCH 177/823] pylint: update to 2.9.6, adopt

---
 srcpkgs/pylint/patches/fix-tests.patch | 13 +++++++++++++
 srcpkgs/pylint/template                | 24 ++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch

diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {

From b589ff1e465f2798060023dc68e788763d988774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:04:17 -0300
Subject: [PATCH 178/823] New package: linux-base-2021.07.21

Base package to be used as dependency for linux and linux-lts. This way
they can share the same code and users who want to stick with a given
kernel version can just install that one and linux-base instead of
needing the linux or linux-lts meta and ignorepkg dances.
---
 srcpkgs/linux-base/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/linux-base/template

diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac

From b6dc0b0edea9c0a2863c38b3c8524b76ce9f4030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:31 -0300
Subject: [PATCH 179/823] linux: update to 5.13.

Also move to using linux-base.
---
 srcpkgs/linux/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From 64b3e1c06829131862063aa92a77d33874c2b2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:46 -0300
Subject: [PATCH 180/823] linux-lts: update to 5.10.

Also move to using linux-base and xlint.
---
 srcpkgs/linux-lts/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From a524266ac3a6da955dac28ceb353dccc712f1815 Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:43:30 -0700
Subject: [PATCH 181/823] cc65: update to 2.19.

---
 srcpkgs/cc65/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 

From 20a66d1bdf525bee71cad5c20b7fb8f86a6f60af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:08:46 -0700
Subject: [PATCH 182/823] CLion: update to 2021.2.

---
 srcpkgs/CLion/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..f2ab575cea34 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -28,8 +28,19 @@ post_extract() {
 	# Remove files for other CPU architectures
 	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/arm
 	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
@@ -37,6 +48,7 @@ post_extract() {
 			rm -rf bin/clion.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/performanceTesting/bin/libyjpagent.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
 		i686)
@@ -44,6 +56,7 @@ post_extract() {
 			rm -rf bin/clion64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac

From d8a2549a152025edfce521d6f568458bf2e59fad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:26:08 +0300
Subject: [PATCH 183/823] bmake: update to 20210704.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..17f5dc72ad89 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210704
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
 python_version=3
 
 do_configure() {

From b5d6157d8c38272c5b02af4cbce71f77edbcc34a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:35:29 +0300
Subject: [PATCH 184/823] help2man: update to 1.48.3.

---
 srcpkgs/help2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes

From 07fef5810a29deb931d78733432358866c11d501 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 15:48:40 +0200
Subject: [PATCH 185/823] apk-tools: update to 2.12.7.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {

From 1e02f8dfbc517088661a976aca9b70376df9463e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:25:52 +0200
Subject: [PATCH 186/823] erlang: update to 24.0.5.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a5d45ab414757f79ea0be705957c0b445d189add Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:26:13 +0200
Subject: [PATCH 187/823] linux5.13: update to 5.13.8.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..43a3f6aa16a6 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 4dc9936a2e1cca6b2e19d6cfb750c6a05cf95b66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:28:18 +0200
Subject: [PATCH 188/823] linux5.10: update to 5.10.56.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 2832c9d04add..6242d17550e8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.54
+version=5.10.56
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
+checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 5230843f9f369e1c35f3f2617cbeadbe55c37f8e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voiceops.com>
Date: Wed, 4 Aug 2021 13:09:36 -0500
Subject: [PATCH 189/823] New package: sftpgo-2.1.0

---
 srcpkgs/sftpgo/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/sftpgo/template

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}

From d94728b669adf92dc8599479aa827850ac210405 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:56:10 +0200
Subject: [PATCH 190/823] icdiff: update to 2.0.4.

---
 srcpkgs/icdiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 3af6dfdcd074..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,6 +1,6 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.3
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 5a818992ea80ead45c200f5be0d3eaea66d0d287 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:57:32 +0200
Subject: [PATCH 191/823] prosody: update to 0.11.10.

Fixes CVE-2021-37601.
---
 srcpkgs/prosody/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"

From 52ed770d2b8e2290f6fb3c3534b6f662c9e3b581 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 3 Aug 2021 10:37:50 +0200
Subject: [PATCH 192/823] fail2ban: update to version 0.11.2

---
 srcpkgs/fail2ban/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3

From adc05833a68047f4608d678f41997bce7058f0b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 193/823] New package: python3-smartypants-2.0.1

---
 srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-smartypants/template

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}

From eb7520cc8138b52fdb76d726d62ad9b34d26a453 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 194/823] New package: python3-typogrify-2.0.7

---
 srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-typogrify/template

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}

From baecb2ac5562176dc002099a13e34a5f6c6373af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 195/823] New package: gi-docgen-2021.6

---
 srcpkgs/gi-docgen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gi-docgen/template

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails

From 775f1e9500d13aa060d8aa56828bf5d09a157a52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 7 Jul 2021 17:08:00 +0200
Subject: [PATCH 196/823] sysprof: update to 3.40.1.

---
 srcpkgs/sysprof/patches/build.patch |  10 --
 srcpkgs/sysprof/patches/musl.patch  | 157 ----------------------------
 srcpkgs/sysprof/template            |  12 +--
 3 files changed, 4 insertions(+), 175 deletions(-)
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch

diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }

From 1584f6641ac5a455f978b45a9ca7a26d00514b0a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Jun 2021 23:48:13 +0200
Subject: [PATCH 197/823] gtk4: update to 4.2.1, split docs, enable sysprof

---
 srcpkgs/gtk4-doc                       |  1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch | 23 ++++++++++++++++
 srcpkgs/gtk4/template                  | 36 +++++++++++++++++++-------
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch

diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 9b48a4f0c5e0ccbf17074cbab54691352179009c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 20:56:22 +0200
Subject: [PATCH 198/823] electrum: update to 4.1.5.

---
 srcpkgs/electrum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From b14cef1cd92d5a3253b5e42bd43d46ba1e5c9c3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Jul 2021 11:01:29 +0200
Subject: [PATCH 199/823] libinput: update to 1.18.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From fdc57786c3644bdc6ab6ba5cb566fd0b49bd0951 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Thu, 5 Aug 2021 11:10:15 -0400
Subject: [PATCH 200/823] shotcut: remove qt5-webkit-devel dep

shotcut does not use webkit since
https://github.com/mltframework/shotcut/commit/a44fe75a4dc7410668935cd0d3470994f5997571.
no revbump because this is purely build-time change.
---
 srcpkgs/shotcut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"

From 57b2e19a9775e63efac22754aae3125e0db87bd0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 19:56:44 +0300
Subject: [PATCH 201/823] notcurses: update to 2.3.13.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 4b3563f65ffc..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 0460665ab43b95d2d95e960995315ad6742f4610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 5 Aug 2021 09:27:02 -0300
Subject: [PATCH 202/823] nvidia: fix proton errors.

Proton sometimes errors out with:

  The NVIDIA driver was unable to open
  'libnvidia-glvkspirv.so.470.57.02'. This library is required at run
  time.

This is caused by an out of date glibc cache, so we now run ldconfig in
INSTALL. This solution was pointed out by mvf.

Unfortunately, this isn't the entirely correct solution: ldconfig should
always be run after package installations that touch /usr/lib, to avoid
similar issues. Until there's a simple solution for it (maybe general
purpose XBPS hooks), this is the best we can do.

Fixes: #32222
---
 srcpkgs/nvidia/INSTALL  | 3 +++
 srcpkgs/nvidia/template | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia/INSTALL

diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..9c022ef65649 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.57.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"

From f6b8a366742d1dd5b1441a4b7c20de270d56765a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:01:56 +0300
Subject: [PATCH 203/823] font-awesome5: update to 5.15.4.

Also:
- add changelog.

Closes: #32339 [via git-merge-pr]
---
 srcpkgs/font-awesome5/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From cffe7b20ded28ae8e17c9a516a4806804da3d525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A9TwT?= <vcyzscape@gmail.com>
Date: Fri, 6 Aug 2021 00:55:17 +0700
Subject: [PATCH 204/823] zoom: update to 5.7.28991.0726_1

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 31e39b774927db23b617ebc30c1a6c33bdae4791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 12:49:42 +0200
Subject: [PATCH 205/823] ipset: update to 7.15.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 51150121385d..77c85ff074f7 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.14
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"

From 0f9a42818c53870137cfc6378cb25d9dffc47197 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:36:27 +0200
Subject: [PATCH 206/823] extrace: update to 0.8.

---
 srcpkgs/extrace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE

From 8008a848bc7a8836c1385d51ec0968e9b2893f17 Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Mon, 12 Jul 2021 04:17:31 -0600
Subject: [PATCH 207/823] arcan: add arcan_sdl subpackage

arcan_sdl allows the running of arcan nested within a different
display server.
---
 srcpkgs/arcan/template | 13 +++++++++++--
 srcpkgs/arcan_sdl      |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/arcan_sdl

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file

From 44489c0572dd28b893cbbd7b8f01344fffb42c9d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:28:11 +0300
Subject: [PATCH 208/823] papirus-icon-theme: update to 20210802.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons

From bedb3f4adaf05a24eb610988b81300221ca49c02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:45:16 +0200
Subject: [PATCH 209/823] ipset: fix checksum.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 77c85ff074f7..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"

From cabb68f88c11f25e2fd64ef07094b48fcde2bdef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 5 Aug 2021 22:51:37 +0200
Subject: [PATCH 210/823] New package: abcmidi-2021.06.27

---
 srcpkgs/abcmidi/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/abcmidi/template

diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38

From 5894e93b0d0bfca141bc90ee284e4f8aae9b2840 Mon Sep 17 00:00:00 2001
From: Wes Roberts <takq@a.zinc.email>
Date: Thu, 5 Aug 2021 18:12:44 -0400
Subject: [PATCH 211/823] timeshift: fix compatibility with util-linux 2.37.1.

Timeshift will only start in "Live USB Mode".

Upstream issues:
https://github.com/teejee2008/timeshift/issues/425
https://github.com/teejee2008/timeshift/issues/753
https://github.com/teejee2008/timeshift/issues/755
---
 srcpkgs/timeshift/patches/d437358a.patch | 23 +++++++++++++++++++++++
 srcpkgs/timeshift/template               |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"

From 9bec1e96b1926f251236462d95e629676763a590 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 5 Aug 2021 23:28:12 +0200
Subject: [PATCH 212/823] hcloud: update to 1.26.1.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE

From 129ec18d7a5ac3f01744aa231d05858648a360f0 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 5 Aug 2021 21:29:38 +0300
Subject: [PATCH 213/823] zoxide: update to 0.7.3.

---
 srcpkgs/zoxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE

From d2b42cca2ea516b3c2b8e7cdc180eaf98801c787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 22:11:18 -0300
Subject: [PATCH 214/823] virtualbox-ose: update to 6.1.26.

Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.

Fix build by setting the correct Qt5 base include path.
---
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 +
 srcpkgs/virtualbox-ose/template              | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {

From 854401248781e1e81f6afcb1ab2370199069e7b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 14:51:17 +0200
Subject: [PATCH 215/823] nncp: update to 7.5.1.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 279d6235b763..48ae842e0016 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.0
+version=7.5.1
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
+checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
 
 do_build() {
 	make

From 9ee4b4d2900632f8337e3a0825c62c3d1bbe1025 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:02:39 +0200
Subject: [PATCH 216/823] python3-pipx: update to 0.16.4.

---
 srcpkgs/python3-pipx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE

From d95459c1d2c7a72889c8556c60aefab2ec2bb9ba Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 5 Aug 2021 22:58:59 +0300
Subject: [PATCH 217/823] jrnl: update to 2.8.2.

---
 srcpkgs/jrnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no

From 0bcecfb7e9fbcb555cdccd06ef3267dc5f654ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:48 +0700
Subject: [PATCH 218/823] cmake: update to 3.21.1.

---
 srcpkgs/cmake/patches/ar-lwyu.patch           | 20 +++++++++
 .../patches/ignore-crape-compiler-test.patch  | 13 ++++++
 srcpkgs/cmake/patches/test-none.patch         | 41 -------------------
 srcpkgs/cmake/template                        | 11 ++---
 4 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do

From 2f4afa8f1abfddd2c577a35847f1196ee2d52840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:56 +0700
Subject: [PATCH 219/823] cmake-gui: update to 3.21.1.

---
 srcpkgs/cmake-gui/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.

From 3ebca62316bbab53b59e1d9d7fd2dbf4db6baee7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:27:38 +0200
Subject: [PATCH 220/823] bcc: link LLVM dynamically.

As a distro, we want this anyway, but static linking also broke, e.g.
bpftrace: https://github.com/iovisor/bpftrace/issues/1855
---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index c2b7a65c19fd..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=3
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"

From 374f72032c4a8a3c6cda89db5f5bcb31c603c015 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:28:42 +0200
Subject: [PATCH 221/823] bpftrace: rebuild against bcc-0.21.0_4.

---
 srcpkgs/bpftrace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..8ca8a7f2409f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run

From 19cdce0d2be1f7e61e38bea75aae7a1093ab60e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 16:20:59 +0200
Subject: [PATCH 222/823] bpftrace: set nostrip.

---
 srcpkgs/bpftrace/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 8ca8a7f2409f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools

From 6876e80203dbaa9430a022ad3b5ba87cfe223243 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:52:35 -0400
Subject: [PATCH 223/823] cpp-utilities: update to 5.11.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 4cd28529efe0f1a6bfd1fed0663e81e0a1dd0fef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:53:14 -0400
Subject: [PATCH 224/823] tageditor: update to 3.4.2.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 2adc3fa61cb6f9d7c7bd8bf340c6e7a6b0abb665 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:54:25 -0400
Subject: [PATCH 225/823] python3-pyzmq: update to 22.2.1.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 84958059cef86cef3da7be9fff21ed2057c18bfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 12:42:19 -0400
Subject: [PATCH 226/823] python3-pip: update to 21.2.3.

---
 srcpkgs/python3-pip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 3e800139d4da..225ede1ccd09 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.2
+version=21.2.3
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
+checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
 # Tests have unpackaged dependencies
 make_check=no
 

From 502aca3c9b04f46be25bc819ca48f5e3eb30f26f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 22 Jul 2021 17:41:10 +0200
Subject: [PATCH 227/823] zsh-autosuggestions: update to 0.7.0.

---
 srcpkgs/zsh-autosuggestions/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }

From 92d6280a14f6c284675a56158d8ccacf7f522437 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:05:59 +0200
Subject: [PATCH 228/823] gotop: update to 4.1.2.

---
 srcpkgs/gotop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE

From c49272fd95e01b152dfe2688adcd5bb88aae65d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:01:55 +0200
Subject: [PATCH 229/823] vala: update to 0.52.4.

---
 common/shlibs                                 |  2 +-
 .../vala/patches/disable-unstable-tests.patch | 14 ++++++++++++++
 srcpkgs/vala/template                         | 19 ++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..7a0c44e9a713 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {

From 5a574082dbe375ec54e45aa8449529b23bc1af72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:08:12 +0200
Subject: [PATCH 230/823] valadoc: update to 0.52.4.

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/patches  | 1 +
 srcpkgs/valadoc/template | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/valadoc/patches

diff --git a/common/shlibs b/common/shlibs
index 7a0c44e9a713..7e6b6fb0d1d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,7 +3120,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if

From d6b24ecc0fb30fd95d6f1eda42e91f233f1b4022 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:05:29 +0200
Subject: [PATCH 231/823] vala-language-server: update to 0.48.3.

---
 srcpkgs/vala-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b

From 4717e3aec14874e82f674d88d446373fff7c83bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:19:57 +0200
Subject: [PATCH 232/823] io.elementary.code: rebuild with vala-0.52.4

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"

From 9b0fdff4cded06134732af00683c9e98bf9eb0af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:20:11 +0200
Subject: [PATCH 233/823] valabind: update to 1.8.0.

---
 srcpkgs/valabind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd

From 13f86007f290ac649623c61bd7fcd79fc0f7d363 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:47:45 +0200
Subject: [PATCH 234/823] bomi: remove package.

Unmaintaned and broken, UI doesn't work.

Upstream issue:
https://github.com/ashinan/bomi/issues/540
---
 srcpkgs/bomi/patches/ffmpeg3.x.patch    |  32 ----
 srcpkgs/bomi/patches/ffmpeg4.patch      | 195 ------------------------
 srcpkgs/bomi/patches/fix-cxx14.patch    |  67 --------
 srcpkgs/bomi/patches/fix-sysctl_h.patch |  22 ---
 srcpkgs/bomi/template                   |  35 -----
 5 files changed, 351 deletions(-)
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template

diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}

From ab99118686705a9ab6544f276fa4a111b04e78a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 6 Aug 2021 16:25:50 -0300
Subject: [PATCH 235/823] removed-packages: add bomi and revbump.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..78ba7731cc3e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=47
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1

From bc22494d4291a69d0092a0bbb3b6f673f4ab3b0b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:18:21 +0200
Subject: [PATCH 236/823] dlayer: update to 0.3.1.

---
 srcpkgs/dlayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE

From 254efe85bb67582197d97c26c96ca7f25a2f6b90 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:19:37 +0200
Subject: [PATCH 237/823] skopeo: update to 1.4.0.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 963354f1ae33f73e28b47f7c43dd39dffa0ec20c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 22:36:22 +0300
Subject: [PATCH 238/823] font-sarasa-gothic: update to 0.34.1.

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 

From ba75905a75bc9e5a7591c48716f7bda0fef9c4ef Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 10:05:46 +0200
Subject: [PATCH 239/823] libid3tag: fix distfiles + lint error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

used mirror distfiles.exherbo.org doesn’t respond anymore
use original sourceforge download site
---
 srcpkgs/libid3tag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {

From 36ad4020678ac2f953103cc8afcaf1dac8eeea6a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 6 Aug 2021 21:36:05 +0200
Subject: [PATCH 240/823] vscode: update to 1.59.0

---
 srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++--
 srcpkgs/vscode/patches/gulp.patch                 | 4 ++--
 srcpkgs/vscode/patches/remove_git_command.patch   | 5 +++--
 srcpkgs/vscode/template                           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 80708719fe8b7ddd2f42603993e5c8ba613b54b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 09:53:55 +0200
Subject: [PATCH 241/823] New package: snowball-2.1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libstemmer                            |  1 +
 srcpkgs/libstemmer-devel                      |  1 +
 .../snowball/patches/libstemmer-library.patch | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template

diff --git a/common/shlibs b/common/shlibs
index 7e6b6fb0d1d6..b8fda590d5f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}

From bc4c6cb0d5c0aa2a6b01e74265a0dfe5db512ecc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 242/823] geary: update to 40.0.

---
 srcpkgs/geary/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..3891e7190112 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

From 968904ad6a86d9b6be8ed1ccdb1045d2123bec18 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Fri, 6 Aug 2021 13:23:34 +0200
Subject: [PATCH 243/823] ugdb: update to 0.1.10.

---
 srcpkgs/ugdb/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE

From ba980cfa21beda60a7fa605bb3f8756831e7a337 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Fri, 6 Aug 2021 21:27:50 +0300
Subject: [PATCH 244/823] protonvpn-cli: add missing dependency

---
 srcpkgs/protonvpn-cli/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index c9a3c784ace6..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,12 +1,13 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.11
-revision=1
+revision=2
 wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"

From ca8150ce4cc4b3ced76f14e6484e881c09c2f93d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:43:36 +0200
Subject: [PATCH 245/823] github-cli: update to 1.14.0.

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date

From 743521e5a23eb9c520f7a2c2952c92574ae2c3d8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:53:39 +0200
Subject: [PATCH 246/823] sigil: update to 1.7.0.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 5b5e97490323801ee94d64b79652df6c30294dd1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:24:59 +0200
Subject: [PATCH 247/823] go: update to 1.16.7.

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 

From fbcba68bfe881cda65e458eb75ffef56b0f19140 Mon Sep 17 00:00:00 2001
From: notthewave <74874782+notthewave@users.noreply.github.com>
Date: Sat, 3 Jul 2021 00:25:52 +0200
Subject: [PATCH 248/823] New package: ART-1.9.3.

Since ART is a RawTherapee fork, the template is basically the same,
with the addition of exiv2 as a dependency.
---
 srcpkgs/ART/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/ART/template

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e

From 28d4b10e5b32aeea8ee2b1bbfb461a2015e0b211 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:24:34 +0200
Subject: [PATCH 249/823] linux5.4: update to 5.4.138.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 807b6b49c848..c204d64759c3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.137
+version=5.4.138
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
+checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 9878fd2de973a59bffb1c255592270feeae544a1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:26:19 +0200
Subject: [PATCH 250/823] linux4.19: update to 4.19.201.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1962af9c6030..b79ed782a91c 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.200
+version=4.19.201
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 102da5a85235e383eb0c495bfa94020d8bf75f76 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:58:04 +0200
Subject: [PATCH 251/823] portage: update to 3.0.21.

---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf

From 23a767713446cfa50990e10aa72b27120714c52e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:07:47 +0200
Subject: [PATCH 252/823] xdotool: update to 3.20210804.2.

---
 srcpkgs/xdotool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 

From 07f9273e5a5c37ddb88317ea79b611d51b0c0d59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:08:32 +0200
Subject: [PATCH 253/823] perl-WWW-Mechanize: update to 2.04.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171

From e2b8cd3e1d774ea4297f4af6106ce39835fa9ea3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:29 +0200
Subject: [PATCH 254/823] dovecot: update to 2.3.16.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..27a781db5139 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
+version=2.3.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 70024136da59051446248930ca54551f5e353f42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:33 +0200
Subject: [PATCH 255/823] dovecot-plugin-pigeonhole: update to 0.5.16.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7e6a1f9ee8332df0bfe312d1badcfdfc95031b14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:43:05 +0200
Subject: [PATCH 256/823] lnav: update to 0.10.0.

---
 srcpkgs/lnav/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..93df79547535 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=

From 09af66c6b63044f3d71fee9c9fc7a74c01f5850e Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:39:54 +0000
Subject: [PATCH 257/823] firefox: orphan

---
 srcpkgs/firefox-i18n/template | 2 +-
 srcpkgs/firefox/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index d1526dfa7ba1..755b02d248c0 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -4,7 +4,7 @@ version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..08c8efadf2d9 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -7,7 +7,7 @@ version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"

From 9b34a80f664a130538039138140dbb8e536ade0f Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:29 +0000
Subject: [PATCH 258/823] ImageMagick: orphan

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"

From dfe008e9d639642fe30b32151e1e264319f0e803 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:37 +0000
Subject: [PATCH 259/823] ImageMagick6: orphan

---
 srcpkgs/ImageMagick6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 7fbcb1d3150c..213d98a37659 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -16,7 +16,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
  libwmf-devel ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"

From a3d08f2bd9d82b3952d17c7737d615d319afc0ce Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:20 +0000
Subject: [PATCH 260/823] cbindgen: orphan

---
 srcpkgs/cbindgen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"

From 5d67e15c2385006a3eaa7262f47f8a740a26aabd Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:35 +0000
Subject: [PATCH 261/823] cozy: orphan

---
 srcpkgs/cozy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b198300da9a4..b08360fffde3 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -11,7 +11,7 @@ depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"

From 95dfe3c79e96766c45590a8fa5162047379ed6be Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:54 +0000
Subject: [PATCH 262/823] ffmpeg: orphan

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..0a0d24683082 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -4,7 +4,7 @@ pkgname=ffmpeg
 version=4.3.2
 revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"

From 9a03a5c9a5e89eacb96e9d2fe47bba49a3f2b1ed Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:12 +0000
Subject: [PATCH 263/823] iverilog: orphan

---
 srcpkgs/iverilog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"

From 140ba315a83771a84c78514c6fa5d92b0d5736fe Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:29 +0000
Subject: [PATCH 264/823] kdenlive: orphan

---
 srcpkgs/kdenlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"

From 7c1e5477b36fd376d81262146fbd14a1fd14fdc4 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:50 +0000
Subject: [PATCH 265/823] mercurial: orphan

---
 srcpkgs/mercurial/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"

From 269f0db128a78a3f256a44ddef71dae4ab25e395 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:14 +0000
Subject: [PATCH 266/823] nv-codec-headers: orphan

---
 srcpkgs/nv-codec-headers/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"

From 5abc8ca58f11c09775a3cb1d78c3c842133c23eb Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:33 +0000
Subject: [PATCH 267/823] olive: orphan

---
 srcpkgs/olive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"

From 4a740196ba8e5fc89c47843d44eaefde9ade94e2 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:43 +0000
Subject: [PATCH 268/823] papi: orphan

---
 srcpkgs/papi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"

From a611ef27b5a4b6ae490b305f68eb8e16352eedf8 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:44:02 +0000
Subject: [PATCH 269/823] postgresql: orphan

---
 srcpkgs/postgresql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..6c30501a7c61 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -13,7 +13,7 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"

From 14a7606b7a5c30b608f82a1c89b760765295201e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 18:01:30 +0200
Subject: [PATCH 270/823] lnav: fix cross.

---
 srcpkgs/lnav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 93df79547535..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh"
+hostmakedepends="automake openssh zlib-devel"
 makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
  pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"

From fdaa57f8a159c19725b5b7378abfd9a7a6a05fb2 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 7 Aug 2021 09:54:19 +0200
Subject: [PATCH 271/823] imv: update to 4.3.0.

---
 srcpkgs/imv/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..608cc8790641 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {

From c80b668161e2484d9369136d262ebd800abfe485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 7 Aug 2021 11:04:45 +0200
Subject: [PATCH 272/823] mpd: update to 0.22.10.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 27a32ccbceb78639d59262751ca9445621a2c707 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Fri, 6 Aug 2021 16:45:33 +0200
Subject: [PATCH 273/823] herbstluftwm: update to 0.9.3

small cosmetic issues
---
 srcpkgs/herbstluftwm/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE

From 7c66d8efcd675cecba9b3712a739f5d7e006eede Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:25:58 -0700
Subject: [PATCH 274/823] hydroxide: update to 0.2.20.

---
 srcpkgs/hydroxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE

From 605d061d5abdf8f71342025f16dab899357946c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 19 Jul 2021 16:48:03 +0200
Subject: [PATCH 275/823] New package: tootle-1.0

---
 srcpkgs/tootle/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tootle/template

diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496

From 58fb5c7cdd01e43c8443c04e3010c8493b3e206e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 21:27:15 +0200
Subject: [PATCH 276/823] graphviz: depend on a default font.

With no fonts available (e.g. chroots), graphviz crashes in pango:
https://gitlab.gnome.org/GNOME/pango/-/issues/588

Depend on liberation fonts which provides the default
times font and most people have it anyway.
---
 srcpkgs/graphviz/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"

From 282e14fcf6ccabd1f45066410afa8c3d9cb0d32f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 7 Aug 2021 21:49:21 +0200
Subject: [PATCH 277/823] lowdown: update to 0.8.6.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md

From 80a6ab44f7ec23b84ead8d95eaa47b97f12c1de3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 7 Aug 2021 15:47:17 +0200
Subject: [PATCH 278/823] freerdp: update to 2.4.0

---
 srcpkgs/freerdp/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;

From 608641723e6d9220f67da6fe454152f4d761ed04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 Aug 2021 00:27:31 +0200
Subject: [PATCH 279/823] lynx: update to 2.9.0dev.9.

---
 srcpkgs/lynx/template | 11 +++++------
 srcpkgs/lynx/update   |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/lynx/update

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"

From 34bca945bff8857d1f322ad7d43fb268c264ad42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 00:19:58 +0300
Subject: [PATCH 280/823] cherrytree: update to 0.99.39.

---
 srcpkgs/cherrytree/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..8789cd37dba7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
+version=0.99.39
 revision=1
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From 26e54c12322dd1c90732727fec6e93c1f2f6b441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 Aug 2021 09:45:27 +0700
Subject: [PATCH 281/823] deluge: allow deluged to be run as different user

Close: #31690
---
 srcpkgs/deluge/files/deluged/run       |  2 +-
 srcpkgs/deluge/patches/drop-priv.patch | 40 ++++++++++++++++++++++++++
 srcpkgs/deluge/template                |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From 06ab55e8270708fcc82e4a52ece5e5577e9b24f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 Aug 2021 11:23:37 +0700
Subject: [PATCH 282/823] vcompletion: return failure on wrong arguments

---
 common/environment/setup/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }

From 492271c9fc454062eb08a9ffe2f350daec3e5a7e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:46:47 +0300
Subject: [PATCH 283/823] cozy: update to 1.1.0.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b08360fffde3..652ed886f3a9 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38

From 892f523e7e757f0dfd6c5fb803aaa91efb851596 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 284/823] New package: libadwaita-1.0.0alpha2

---
 common/shlibs                                 |  1 +
 srcpkgs/libadwaita-demo                       |  1 +
 srcpkgs/libadwaita-devel                      |  1 +
 .../patches/disable-broken-tests.patch        | 10 ++++
 srcpkgs/libadwaita/template                   | 59 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template

diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5affb5dc09fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,6 +3511,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..cb23b656c004
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-$_ver"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}

From ab0d770562498a79130285857cdf67778f03d46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 8 Aug 2021 19:08:49 +0200
Subject: [PATCH 285/823] croc: update to 9.2.1.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE

From ddc8f62e4399ab67bd4732f6acf5e46dfb8b501d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 22:09:09 +0300
Subject: [PATCH 286/823] putty: update to 0.76.

Also:
- add changelog.
---
 srcpkgs/putty/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 

From 9b2c36a8b91becf6543c38a797e606349dd77090 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:03:59 +0300
Subject: [PATCH 287/823] gpodder: update to 3.10.21.

Also:
- add necessary packages to depends and checkdepends.
---
 srcpkgs/gpodder/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest

From 2499cf0b5a483525eff55cf577b4b3e02a36eb22 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:05:09 +0300
Subject: [PATCH 288/823] New package: python3-pytest-httpserver-1.0.1

---
 srcpkgs/python3-pytest-httpserver/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-httpserver/template

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..d866ff71c6df
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc="pytest-httpserver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}

From c1248239e3d1d845a0fd8ecda77668aa090a50b9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:27:52 +0300
Subject: [PATCH 289/823] bmake: update to 20210803.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 17f5dc72ad89..ef3463e7e554 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210704
+version=20210803
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
+checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
 python_version=3
 
 do_configure() {

From 70b94605bbe99daafa44a0fcaf0245b583b1b697 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 21:58:01 +0300
Subject: [PATCH 290/823] stremio-shell: update to 4.4.142.

---
 srcpkgs/stremio-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From 8c27555a6c6731f13e8aa057873b867bf2deddc6 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 7 Aug 2021 15:39:08 +0200
Subject: [PATCH 291/823] master-pdf-editor: update to 5.7.90.

---
 srcpkgs/master-pdf-editor/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5

From 453386dbdac634d5dc140c95efd00baa7cdd03e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:03:39 +0300
Subject: [PATCH 292/823] catfish: update to 4.16.2.

---
 srcpkgs/catfish/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b

From 9bf235b9d5e81647fe54bd0b6465f4357fded2cc Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:15:35 +0200
Subject: [PATCH 293/823] py3status: update to 3.38.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE

From b2399646a26826dc4a01c2cbc1af526426561c74 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 7 Aug 2021 11:05:38 +0300
Subject: [PATCH 294/823] sdparm: update to 1.12.

---
 srcpkgs/sdparm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING

From 62f3090fb014cd7828bd49f943c55042c8a7964c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:09:34 +0300
Subject: [PATCH 295/823] xfce4-sensors-plugin: update to 1.4.1.

Closes: #32391 [via git-merge-pr]
---
 srcpkgs/xfce4-sensors-plugin/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 2af12665cb84dbc8b851fd98327cda7898c5921c Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 7 Aug 2021 18:33:22 +0530
Subject: [PATCH 296/823] Komikku: update to 0.30.0.

---
 srcpkgs/Komikku/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..7a612602214d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
-revision=2
+version=0.30.0
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6

From 5f37e142e6f6e59c409f2de0cdf7f0e26a231cff Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:19:29 +0200
Subject: [PATCH 297/823] drone-cli: update to 1.3.0.

---
 srcpkgs/drone-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c

From 61595973d6eb4ef354a25136538bc8003ec511c6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:43:00 +0200
Subject: [PATCH 298/823] gparted: update to 1.3.1.

---
 srcpkgs/gparted/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:

From 771a0f0205e4ff32b82f6d0d15f8e3f7d3067075 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:54:53 +0200
Subject: [PATCH 299/823] openimagedenoise: update to 1.4.1.

---
 srcpkgs/openimagedenoise/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest

From 543c6de08df9b994b6ba0e0f1b32883ced2211b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:01:21 +0300
Subject: [PATCH 300/823] kvantum: update to 0.20.1.

---
 srcpkgs/kvantum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From 4e638ee39bc558222c70a9e0e622fae1c9022f95 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 6 Aug 2021 13:38:14 +0300
Subject: [PATCH 301/823] mesa: add zink gallium driver

---
 srcpkgs/mesa/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8664f4d799bc..68d6a112681e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.1.6
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -152,9 +152,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +163,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 

From 6ad1cc7cc4573ee3fa4e7fc4daff66bffebfc2e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:42:54 +0300
Subject: [PATCH 302/823] qt5ct: update to 1.3.

---
 srcpkgs/qt5ct/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..b0a5d19b3cba 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
+version=1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING

From e19b450ed6284f28385fa302dc1aff450d2fab12 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:03:59 +0200
Subject: [PATCH 303/823] instaloader: update to 4.8.

---
 srcpkgs/instaloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE

From 11dea899f9ae6088ddbe3ee4173b9a79d8abb55f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:29:30 +0200
Subject: [PATCH 304/823] volctl: update to 0.9.0.

---
 srcpkgs/volctl/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code

From fe42ca1f93033d82f64c9b43dd8e75fa3a336ed2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 3 Aug 2021 19:20:34 +0400
Subject: [PATCH 305/823] libcap: update to 2.52.

---
 srcpkgs/libcap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 37b496d7ec804d98c5540f454dff835a774ce72a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:00:00 +1000
Subject: [PATCH 306/823] retroarch: disable gles2 by default, add libusb and
 xdg-utils deps

When both gles2 and opengl options are enabled, RetroArch will only
build with OpenGL ES support. This prevents OpenGL only cores from working.
Disable gles2 by default and use the glcore driver which provides OpenGL 3.2+
and OpenGL ES 3+ support. Fixes: #32246

libusb support is automatic and is currently pulled in when sdl2 is enabled.
Add it to makedepends to ensure it's always enabled.

RetroArch will call xdg-screensaver when it's built with X11 support.
Add xdg-utils to depends when the x11 option is enabled.
---
 srcpkgs/retroarch/template | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 

From c18de35a9a8d939c692e4242ba91791bf39f103f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:52 +0200
Subject: [PATCH 307/823] babashka: update to 0.5.1.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From b9961506beece288ca6f5675cd6f4c0b0e283618 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:56 +0200
Subject: [PATCH 308/823] byacc: update to 20210808.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index db54998f0f25..e987a97cce79 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210802
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
+checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 0d51e41b7f1c55ce97fe152380126e2751038187 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:05:37 +0200
Subject: [PATCH 309/823] nncp: update to 7.6.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 48ae842e0016..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.1
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make

From 2416b39be22b4b5b5a90e841a2e96492f90faecc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:06:38 +0200
Subject: [PATCH 310/823] ugrep: update to 3.3.7.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 2de843eb240abeaeaed8d4b9dee1bd269ad56cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:15:39 +0200
Subject: [PATCH 311/823] amdvlk: update to 2021.Q3.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..e91154da11d4 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.2
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
+_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
+_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
+_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
+ 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
+ 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
+ fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
+ d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From fbf78154deee50d0829738cd82d8a3ad9997a0be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 14:32:17 +0200
Subject: [PATCH 312/823] R-cran-ggplot2: update to 3.3.5.

---
 srcpkgs/R-cran-ggplot2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea

From 24d2d723c0077d762e4652eec5aa4f836452a597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:39:20 +0200
Subject: [PATCH 313/823] fixup! amdvlk: update to 2021.Q3.2.

---
 .../amdvlk/patches/cmake-build-type-none.patch   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt

From b65b51dd60a15f51cd171a9f8f66cdce1a514bfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:43:42 +0200
Subject: [PATCH 314/823] SLADE: update to 3.1.13.

---
 srcpkgs/SLADE/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in

From f7225805af0557bf84fea6dd435b38b2be4e2cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:06 +0200
Subject: [PATCH 315/823] amdvlk: update to 2021.Q3.3.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index e91154da11d4..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.2
+version=2021.Q3.3
 revision=1
-_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
-_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
-_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
-_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
- 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
- 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
- fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
- d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 1b2a2ae6ba3b318d76022694bbe700817e6249cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:39 +0200
Subject: [PATCH 316/823] krita: update to 4.4.7.

---
 common/shlibs                                | 25 --------------------
 srcpkgs/krita/patches/aarch64.patch          | 19 +++++++++++++++
 srcpkgs/krita/patches/cross.patch            | 13 ++++++++++
 srcpkgs/krita/patches/invalid-MimeType.patch | 11 ---------
 srcpkgs/krita/template                       |  4 ++--
 5 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch

diff --git a/common/shlibs b/common/shlibs
index 5affb5dc09fd..278d2456072f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 

From fa9fe89b2de7a3ba9fb65067eb1759e35fc63dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:45:22 +0200
Subject: [PATCH 317/823] pioneer: update to 20210723.

---
 srcpkgs/pioneer/patches/ppc.patch | 6 +++---
 srcpkgs/pioneer/template          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From a55648e8ddba7fc84bf5c5ca4581a8cd7023251d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 9 Aug 2021 13:03:25 +0200
Subject: [PATCH 318/823] homebank: update to 5.5.3.

---
 srcpkgs/homebank/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From f4cf9013dbfc8aa421c80d8fd158dfa42b0df689 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:18:07 +0300
Subject: [PATCH 319/823] wps-office: update to 11.1.0.10702 and adopt.

---
 srcpkgs/wps-office/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 

From 51890b8c8274c24a3ea20979195c565c502214b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 9 Aug 2021 18:51:56 +0200
Subject: [PATCH 320/823] fetchmail: update to 6.4.21.

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 964aadf452d13b74a0def4f81d715f8624ff64ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:44:32 +0200
Subject: [PATCH 321/823] psiconv: remove package

* upstream is dead, distfiles are not available
* depends on libmagick6
---
 srcpkgs/psiconv-devel             |  1 -
 srcpkgs/psiconv/template          | 28 ----------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template

diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 78ba7731cc3e..566536002191 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -229,6 +229,7 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From 70e69e36db44ccb51a052ea982e645f932200694 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jul 2021 10:48:46 +0200
Subject: [PATCH 322/823] meson: update to 0.58.2

---
 .../dont-use-native-pkgconfig-for-gir.patch   | 11 ---
 srcpkgs/meson/patches/fix-unittest.patch      | 77 -------------------
 srcpkgs/meson/template                        |  7 +-
 3 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch

diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 64d4eac7d8844f0979b22d67def3439002a86a91 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 9 Aug 2021 04:03:16 +0300
Subject: [PATCH 323/823] vale: update to 2.10.4.

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE

From 29c2a55ab3ef30e1227ee5cc28d436e31c3f31b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 14:14:18 +0200
Subject: [PATCH 324/823] goxel: update to 0.10.8.

---
 srcpkgs/goxel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From e678e13b22a8e4f87cfda28813f59dcf35f26492 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 15:02:41 +0200
Subject: [PATCH 325/823] clazy: update to 1.10.

---
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ++++++++++++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 -----
 srcpkgs/clazy/template                        |  11 +-
 3 files changed, 370 insertions(+), 93 deletions(-)
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch

diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d

From 059324779c25ea6f62977e05afc78a9d18f3dead Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 20:13:14 +0200
Subject: [PATCH 326/823] lagrange: update to 1.6.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..15992e57dbaa 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
 
 post_install() {
 	vlicense LICENSE.md

From 85eb810b4e4220961578d50a164982bc8efd85e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:06 +0200
Subject: [PATCH 327/823] knewstuff: add missing dependencies

closes #703
---
 srcpkgs/knewstuff/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..156fa1a0102b 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,11 +1,12 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
 version=5.84.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"

From a5659dc1dae87705a33c07b4a818e470fecf9f55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:47 +0200
Subject: [PATCH 328/823] yakuake: add missing dependency

---
 srcpkgs/yakuake/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..61d6e2e645c4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,11 @@
 # Template file for 'yakuake'
 pkgname=yakuake
 version=21.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"

From cf9cf9fde9d266dfe6b57e56cf703e2b86fa7b37 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Sun, 8 Aug 2021 00:27:14 +0700
Subject: [PATCH 329/823] ibus-bamboo: update to 0.7.8.

---
 srcpkgs/ibus-bamboo/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }

From ece36fae0a89a95ee29aacf0b268326fb5eeb86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 10 Aug 2021 15:09:36 +0700
Subject: [PATCH 330/823] cozy: fix cross build with meson 0.57+

While we're at it, drop unnecessary makedepends, this is a python only
package after all.
---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 652ed886f3a9..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -4,9 +4,9 @@ version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"

From 198cf452e93c9ac32678f5b8c1e4e12ed9f0a30b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 10 Aug 2021 12:48:00 +0200
Subject: [PATCH 331/823] linux5.13: update to 5.13.9.

Set CONFIG_PTP_1588_CLOCK_KVM=m to remove a boot warning on non-VM boots.

Set CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y.
Set CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m, CONFIG_SND_SOC_RT1308=m.

Closes #30508.
---
 srcpkgs/linux5.13/files/i386-dotconfig   | 24 ++++++++++----------
 srcpkgs/linux5.13/files/x86_64-dotconfig | 28 +++++++++++++-----------
 srcpkgs/linux5.13/template               |  4 ++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 43a3f6aa16a6..2c8c80b9945f 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.8
+version=5.13.9
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
+ 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b192a5e1e80fb7a35646363d2167369a604f472f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 08:27:36 -0300
Subject: [PATCH 332/823] c-ares: update to 1.17.2.

Fixes CVE-2021-3672.

Also fix tests (locally).
---
 srcpkgs/c-ares/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}

From 9d636d3bdacef27bf4bc3352daddaa5921565b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 10:09:34 +0200
Subject: [PATCH 333/823] crispy-doom: update to 5.10.2.

---
 srcpkgs/crispy-doom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 

From 3ca5820a1f9503692d6da3b0ab4eb70f7f68e7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 09:53:42 +0200
Subject: [PATCH 334/823] doctl: update to 1.63.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0

From fb3eaae48b27fe37f0fe81748e9950f2a5c4133b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 10:34:01 +0300
Subject: [PATCH 335/823] thefuck: update to 3.31.

---
 srcpkgs/thefuck/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {

From 44b44c1260ddb2a8fd42bb65e51b64ab5b8cc8c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 16:46:29 +0200
Subject: [PATCH 336/823] piper: update to 0.6.

---
 srcpkgs/piper/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi

From c2adb8240dcf3a7d38c265547b8de8d1f933dca2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:32:15 +0200
Subject: [PATCH 337/823] sfeed: update to 1.0.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 9f3d23098319..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.25
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE

From 19a3a55a4ee766e354d78fe270370763a5f02db3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:33:47 +0200
Subject: [PATCH 338/823] sfeed_curses: update to 1.0.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 148f3d67f824..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.13
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE

From 80ad1eb9a9b0f136037f57fab3abaf252ae8826e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:10:39 +0300
Subject: [PATCH 339/823] broot: update to 1.6.3.

---
 srcpkgs/broot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 542bc12852bc2e685596366aa28d529136b45cbe Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 13:46:14 +0200
Subject: [PATCH 340/823] micro: update to 2.0.10.

---
 srcpkgs/micro/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE

From 9a4e0b2c077041b6865a46f926000563375d8653 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 14:06:21 +0200
Subject: [PATCH 341/823] swaybg: update to 1.1.

---
 srcpkgs/swaybg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE

From 363e3df9d25e428cfeed233d22cc25ff63fe09d7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH 342/823] haproxy: enable hitless reloads

Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
 srcpkgs/haproxy/files/haproxy.cfg | 1 +
 srcpkgs/haproxy/files/haproxy/run | 2 +-
 srcpkgs/haproxy/template          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"

From 1448a24c03f63520f91aa82dfed4b44feeb8e9d0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 17 Jun 2021 11:06:52 +0200
Subject: [PATCH 343/823] noise-repellent: update to 0.1.5.

Add patch made by ericonr to fix cross compilation.
---
 .../noise-repellent/patches/fix-cross.patch   | 28 +++++++++++++++++++
 srcpkgs/noise-repellent/template              |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch

diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae

From a63e1b5601bdaf49d1094ca06a916cb5590d8cf3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:40:12 +0200
Subject: [PATCH 344/823] New package: libgnt-2.14.2.

---
 srcpkgs/libgnt                        |   1 -
 srcpkgs/libgnt-devel                  |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff | 130 ++++++++++++++++++++++++++
 srcpkgs/libgnt/template               |  31 ++++++
 4 files changed, 162 insertions(+), 2 deletions(-)
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template

diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}

From a46ad8173733f1fc982b65ae69149047aa7f3336 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:42:14 +0200
Subject: [PATCH 345/823] pidgin: update to 2.14.6.

---
 .../patches/01-configure_ac-libnm_pc.patch    | 11 -------
 .../patches/02-libpurple-nm_state.patch       | 19 ------------
 srcpkgs/pidgin/template                       | 30 +++++--------------
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch

diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {

From cdd0a7812b02fe9f8f15d65a9ab6bb36d333957e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 10 Aug 2021 19:00:57 +0200
Subject: [PATCH 346/823] ugdb: fix build on platforms without 64-bit atomics

---
 srcpkgs/ugdb/patches/atomicu64.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch

diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 

From 62b997a8fac0610c66bf507a148b4f0efc920967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 14:10:41 -0300
Subject: [PATCH 347/823] srcpkgs/: touch new packages for the builders.

aarch64* repos are missing some.
---
 srcpkgs/libadwaita/template                | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index cb23b656c004..6b49f233b3ec 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -3,7 +3,7 @@ pkgname=libadwaita
 version=1.0.0alpha2
 revision=1
 _ver=1.0.0-alpha.2
-wrksrc="$pkgname-$_ver"
+wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d866ff71c6df..12afe88ffe07 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-httpserver
 version=1.0.1
 revision=1
-wrksrc="pytest-httpserver-${version}"
+wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pytest python3-Werkzeug"

From 85e2bc28355f72f6da09422c0ea6fdd58175018e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 10 Aug 2021 17:59:01 +0200
Subject: [PATCH 348/823] cmus: orphan

---
 srcpkgs/cmus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"

From 9f1d20273ce9280b4c140a59edfc1eb6d6c64658 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Tue, 10 Aug 2021 10:21:49 -0400
Subject: [PATCH 349/823] synapse: update to 1.40.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index b45f32817bdf..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.39.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 30110eddaae5244ce00de41955b250d8bc7fc3b2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 20:01:53 +0300
Subject: [PATCH 350/823] fstrm: update to 0.6.1.

---
 srcpkgs/fstrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi

From 9748f7ffb8d320d2280cbaae3fc72851c5d3b8f6 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:04:00 +1000
Subject: [PATCH 351/823] xdg-utils: xdg-screensaver needs xset

---
 srcpkgs/xdg-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 

From 945c22b1cdb9b9089d354718985be824a213d7b3 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sat, 31 Jul 2021 09:26:45 -0400
Subject: [PATCH 352/823] dolphin-emu: update to 5.0.14790.

---
 .../dolphin-emu/patches/VkDeviceMemory.patch  | 37 -------------------
 srcpkgs/dolphin-emu/template                  | 20 +++++++---
 2 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch

diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }

From 6de2a07f31c5369e0e4100e6c1f5a76301278796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Tue, 10 Aug 2021 00:19:56 +0200
Subject: [PATCH 353/823] New package: alsa_rnnoise-1.0_1

Closes #29409
---
 srcpkgs/alsa_rnnoise/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/alsa_rnnoise/template

diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d

From 6f7803b354462ce3cbb5e415bd09b90b46295160 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 10 Aug 2021 19:23:15 +0100
Subject: [PATCH 354/823] font-iosevka: update to 9.0.1.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..1388c2af3ccd 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=9.0.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
+be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
 
 font_dirs="/usr/share/fonts/TTF"
 

From ccc4697d30902ecaf5bf56f12066e5d0cd05fd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 31 Jul 2021 15:22:09 +0200
Subject: [PATCH 355/823] podman: update to 3.2.3.

By ericonr:
- remove INSTALL.msg, it's been 4 months since the change
- add changelog
---
 srcpkgs/podman/INSTALL.msg | 15 ---------------
 srcpkgs/podman/template    |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/podman/INSTALL.msg

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 73c0bab64683373e3d3f438d4ce8e940740a9cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:51:28 -0300
Subject: [PATCH 356/823] rustup: remove INSTALL.msg.

Anyone who finds the file under /usr/share/doc will be using
`xbps-query -f` to list package contents, so they might just as well see
the only executable in the package.
---
 srcpkgs/rustup/INSTALL.msg | 1 -
 srcpkgs/rustup/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/rustup/INSTALL.msg

diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo

From 0b53153930f2477b35b46cfe897985820215bdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:54:06 -0300
Subject: [PATCH 357/823] qt5ct: remove INSTALL.msg.

---
 srcpkgs/qt5ct/INSTALL.msg | 1 -
 srcpkgs/qt5ct/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg

diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index b0a5d19b3cba..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
 version=1.3
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"

From 45d9a736def438e1c3a4df6cd910bc23155807b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:55:12 -0300
Subject: [PATCH 358/823] git-lfs: remove INSTALL.msg.

Man page shows installation in EXAMPLES.
---
 srcpkgs/git-lfs/INSTALL.msg | 1 -
 srcpkgs/git-lfs/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg

diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"

From a47050cf5236b5afa259f01d849aba0ffe666cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:52:24 -0300
Subject: [PATCH 359/823] python3-docutils: update to 0.17.1, remove
 python-docutils.

---
 .../python-docutils/patches/test-import.patch | 20 ------
 srcpkgs/python-docutils/template              | 62 -------------------
 srcpkgs/python3-docutils                      |  1 -
 srcpkgs/python3-docutils/template             | 39 ++++++++++++
 4 files changed, 39 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template

diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}

From 9b375e93d2825cb51f815b1529d259d1a3851909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:53:05 -0300
Subject: [PATCH 360/823] removed-packages: add python-docutils.

We ship only python3-docutils now.
---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 566536002191..fa919b6de59b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=47
+revision=48
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -234,6 +234,7 @@ replaces="
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2

From be6fb51739582fb4c7c9ae26dca67b0f1cb192da Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 Aug 2021 16:21:28 -0500
Subject: [PATCH 361/823] nvidia: update to 470.63.01.

---
 srcpkgs/nvidia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 9c022ef65649..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
-revision=2
+version=470.63.01
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From d4e3808492af189cfd3cdc8feb391d82e3404151 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 21:44:56 +0200
Subject: [PATCH 362/823] catgirl: update to 1.9.

---
 srcpkgs/catgirl/patches/add-missing-include.patch | 10 ++++++++++
 srcpkgs/catgirl/template                          |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch

diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0

From 3ab746854933a2671846174e84766551221c13d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Jul 2021 01:38:42 -0300
Subject: [PATCH 363/823] rpi-kernel: update to 5.10.52.

- document how we pick the commit to be used
- fix header installations so dkms works; based on fixes to mainline
  kernel packages

In this update, we are using the commit from
https://github.com/raspberrypi/linux/releases/tag/1.20210727
---
 srcpkgs/rpi-kernel/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 22d1ed37eec412d993c0b277d03883beb9925d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:39 -0300
Subject: [PATCH 364/823] rpi2-kernel: update to 5.10.52.

---
 srcpkgs/rpi2-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 3ffa6f39e98524d239d3a72cdf8253564841873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:20 -0300
Subject: [PATCH 365/823] rpi3-kernel: update to 5.10.52.

---
 srcpkgs/rpi3-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 4e4438ced96be85040889ea196bb595b92e6ab89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 4 Aug 2021 10:18:40 -0400
Subject: [PATCH 366/823] rpi4-kernel: update to 5.10.52.

---
 srcpkgs/rpi4-kernel/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From af72e1411e0531881f1fbd264046aebecfe01a52 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 21:39:19 -0500
Subject: [PATCH 367/823] nomad: update to 1.1.3

---
 srcpkgs/nomad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;

From 3b360a4e225ddc73e4ebe9b7682c552500bb73f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:50 -0300
Subject: [PATCH 368/823] mdBook: update to 0.4.12.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 49e3264c70be..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.11
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE

From e7f4dfff3fb0118ec541ebecbc382bbc31e896da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:53 -0300
Subject: [PATCH 369/823] qbittorrent: update to 4.3.7.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}

From 070e756a6c39bc6684a78f8bb4a6f4e898918950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:58:40 -0300
Subject: [PATCH 370/823] gzdoom: update to 4.6.1.

---
 srcpkgs/gzdoom/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes

From 9d489ec884d0968aadfc31cb59ac6c2cd7eb102d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH 371/823] octave: update to 6.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
  packages easier was considered, but ultimately dismissed; since they
  aren't enough to actually build packages, they would increase
  dependency count for little gain

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
---
 srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From 644a89d95b2775b849d841fd28589a088ed66f2d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:05:48 -0500
Subject: [PATCH 372/823] consul: update to 1.10.1.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE

From 21c7385bb2a3d3bf67778a6ea24b13f1805ae881 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:13:16 -0500
Subject: [PATCH 373/823] vault: update to 1.8.1.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"

From 92fe487114f817f1ea886f8969bf0d7418794c93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 14:30:04 +0200
Subject: [PATCH 374/823] iputils: update to 20210722.

---
 srcpkgs/iputils/template | 6 +++---
 srcpkgs/iputils/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/iputils/update

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'

From 401bbbd49e3512d3e4d53b6c65dca20809eba463 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:13:05 +0200
Subject: [PATCH 375/823] byacc: fix checksum

---
 srcpkgs/byacc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index e987a97cce79..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From c58ed63a78d096074a14f9dd269d3e7b3065c0ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:10:40 +0200
Subject: [PATCH 376/823] icu: update to 69.1.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..8d1e95f063ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..a05d0a7d35a8 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,20 +2,21 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
-revision=2
+version=69.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"

From c4549d5fd5dca78f3c062cdea21cd31bdec3e924 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 377/823] OpenRCT2: rebuild for icu-69.1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 761da7f1e580..8eeb3f75b528 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
 version=0.3.4.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 8c385227b7d03b901e35849931fc87fb01be0235 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 378/823] R: rebuild for icu-69.1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 560545bf26b57e43795d8391010c0f9cf9e0a06b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 379/823] an: rebuild for icu-69.1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 57b0ea1b1beaf1f9abdac1714929173622368f3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 380/823] boost: rebuild for icu-69.1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From 5600ed3a509752c2eb77000b0573d0964b379b5a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 381/823] brltty: rebuild for icu-69.1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From 40b52420b872910a9e31a4452fcabf9c084d76d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 382/823] calibre: rebuild for icu-69.1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From f6939f9ef490e2f94e478db63c12ea4310319d37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 383/823] clamav: rebuild for icu-69.1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From af05df86a979735e827307592b4785e45a887ba9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 384/823] darktable: rebuild for icu-69.1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 7c694d6277f3bf1167c0c9803e32707756ef2566 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 385/823] dino: rebuild for icu-69.1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From 62e9b8bd48c7df10718ef65e1ab63d969540027d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 386/823] dwdiff: rebuild for icu-69.1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From 1a26307d900d57ce2630bc74d4dc6050a9f86295 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 387/823] enchant2: rebuild for icu-69.1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..59413b958747 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;

From 1ee96f8e5cec8e7aefbbf23bc91829de656ce487 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 388/823] evolution-data-server: rebuild for icu-69.1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF

From 44060d639dba1d3dec0c90cc8b0bc759a2107788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 389/823] firefox: update to 91.0, rebuild for icu-69.1

---
 srcpkgs/firefox/patches/lto-thin.patch | 19 +++++++++++++++++++
 srcpkgs/firefox/template               |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 08c8efadf2d9..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 

From 687a9ff5333e50f957ce7e66a9d199e148caefd2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 390/823] firefox-esr: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 

From 7443a6acf71c9087c5f21d620580d26e4591d3f5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 391/823] freshplayerplugin: rebuild for icu-69.1

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 14bc44f343cc6c2e5fc64165542871fe10e6ad8d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 392/823] geary: rebuild for icu-69.1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 3891e7190112..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From a8db0d519894f75d3e2a8227f92d25a539fe5adf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 393/823] gnucash: rebuild for icu-69.1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From be23e25c8c7e59a29eb6544fa1e51050e0c89017 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 394/823] gnustep-base: rebuild for icu-69.1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 80f2e43f8255928643169197b9fdf7b284ab9005 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 395/823] gnustep-gui: rebuild for icu-69.1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From ecc8ba93cdaa88330e6d1320ec734fc51f21c0a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 396/823] harfbuzz: rebuild for icu-69.1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 106a44ff3139..6964948610fa 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=2.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From 8c788e2e7e4911c5a67a9d979989a1f72fc313a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 397/823] icu4lua: rebuild for icu-69.1

---
 srcpkgs/icu4lua/patches/icu-68.patch | 94 ++++++++++++++++++++++++++++
 srcpkgs/icu4lua/template             |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch

diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From ca6f50d6295beb8b1ab34b8c94f94b7e7d6f8d05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 398/823] imv: rebuild for icu-69.1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 608cc8790641..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel

From eafc433260925863d115c5458f6f9f85f922ae0c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 399/823] kdb: rebuild for icu-69.1

---
 srcpkgs/kdb/patches/kdb-fix-build.patch    | 67 ++++++++++++++++++++++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch | 33 +++++++++++
 srcpkgs/kdb/template                       |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch

diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From c791aa5a9da9a9cf6d02ee2a16ae97e51e639f0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 400/823] kiwix-lib: rebuild for icu-69.1

---
 srcpkgs/kiwix-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then

From 72da42678cbf642df5c88032697bff184cbbcaed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 401/823] libbitcoin-blockchain: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-blockchain/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From b8653dde3b601f755def2f9833a3f5d6844be28d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 402/823] libbitcoin-client: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"

From 37cf88d14901a8dfbed00cec9f6b0b3d4f85c9a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 403/823] libbitcoin-database: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-database/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 00387d8218cfd2802b1e569125687ea8f7eeedd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 404/823] libbitcoin-explorer: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-explorer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 8ef76648c9f8af99642f6bb85c4374625979de98 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 405/823] libbitcoin-network: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-network/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 14328fc0c5e7951cc790271663dbf0f6c02a4776 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 406/823] libbitcoin-node: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-node/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From e7dfdaf30dfb63f0c2bc65ad7969cc6fb2d500e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 407/823] libbitcoin-protocol: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-protocol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 0376fc4f6f0582e5c81ca2591c4e0839f94704d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 408/823] libbitcoin-server: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 7cf55657419eef3fceb69a03304f9f7ab5525b8f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 409/823] libbitcoin-system: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png

From 27a641f1ee42fb466f0f6ab5cca091ff86d12120 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 410/823] libcdr: rebuild for icu-69.1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 2961ee0600e0d074b9fff9b2a7bf32ccbbac516a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 411/823] libe-book: rebuild for icu-69.1

---
 srcpkgs/libe-book/patches/icu-68.patch | 20 ++++++++++++++++++++
 srcpkgs/libe-book/template             |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch

diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From eaeb78bd3853c49cede9fcf2186c04aac98a32cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 412/823] libgdal: rebuild for icu-69.1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From e1442521f03b8862cc3f8515f5aa857d8ca65bc1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 413/823] libical: update to 3.0.10, rebuild for icu-69.1

---
 srcpkgs/libical/patches/fix-cross.patch | 58 +++++++++++++++++++------
 srcpkgs/libical/template                |  7 ++-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"

From 5c7b1a847913e847d2bfaeca37360651a3cca821 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 414/823] liblcf: rebuild for icu-69.1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 3c5670777aa429af95ab04d53dbf0e81159a7b05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 415/823] libmspub: rebuild for icu-69.1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From 0a42637e8f5bd39f3d9ec751eb6468d60f64f229 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 416/823] libpsl: rebuild for icu-69.1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From f565756f1baff450fe9a9f11e18b7cd6cb846477 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 417/823] libqxp: rebuild for icu-69.1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From f103f06410f027709aff6e903b9ceaf0b9a7b7ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 418/823] libreoffice: rebuild for icu-69.1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 334026e6ecce8f1533e0222b01127eb4b668b371 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 419/823] libvisio: rebuild for icu-69.1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From bc867cd8d3ded35cfa1ac194f301b2fb2a6f8307 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 420/823] libxml2: rebuild for icu-69.1

---
 srcpkgs/libxml2/patches/icu-68.patch | 25 +++++++++++++++++++++++++
 srcpkgs/libxml2/template             |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch

diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From 9c4fdbac3b4e2430aec081051a82eb5e0b2ff167 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 421/823] libzim: rebuild for icu-69.1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 3b0c4fc3d3737b540f71d19f9788a3d1161ea10f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 422/823] maim: rebuild for icu-69.1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 2f221605158eb2704bb3f944009f4dea92172da5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 423/823] modsecurity: rebuild for icu-69.1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From 114e04702a3a9dc8c5932e54b9798e76287f1790 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 424/823] mozjs78: rebuild for icu-69.1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 8e4ce04fde983b40c5b0957808daf53bc67c2e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 425/823] ncmpcpp: rebuild for icu-69.1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From b6fa357254b17c3156575b83246f158f5c9eff52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 426/823] nodejs: rebuild for icu-69.1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From 71ecb42ee2265131b10f645392180e39984e1acf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 427/823] nodejs-lts: update to 12.22.4, rebuild for icu-69.1

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 10fc60699a24834c5f076c5f4fe69880e5e30c60 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 428/823] nodejs-lts-10: remove

---
 srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ---
 srcpkgs/nodejs-lts-10/patches/ppc32.patch   | 29 -------
 srcpkgs/nodejs-lts-10/patches/ppc64.patch   | 41 ---------
 srcpkgs/nodejs-lts-10/template              | 96 ---------------------
 srcpkgs/nodejs-lts-10/update                |  2 -
 5 files changed, 182 deletions(-)
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update

diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"

From d737aa0e965236395e114ee623bf623bf368fa19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 429/823] nuspell: rebuild for icu-69.1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From c6bb1bd924b1d161e18036e83294ae00b5313e99 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 430/823] openttd: rebuild for icu-69.1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes

From 7f6bc9d74004a013a9b2d48d52e3ac1a7a79bfa9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 431/823] peaclock: rebuild for icu-69.1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From 5d7fe94a63716944c081cfff6694e6501c4df408 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 432/823] perl-XML-LibXML: rebuild for icu-69.1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From 0c5b8a3423c6de345bba7ca680d1513bf1742891 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 433/823] php: rebuild for icu-69.1

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From f5882a3c7deba70adeb1a6b13594a655bcc72a94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 434/823] poedit: rebuild for icu-69.1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From a573fba5f9fcd1d4f658e4a0620cb4633c3cf2a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 435/823] postfix: rebuild for icu-69.1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4dc1b9e5dad8..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.6.2
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From f71297c131d9b8ff0a8543487693b3f5607bf683 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 436/823] python3-PyICU: rebuild for icu-69.1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a8c8c6d8ef5f4f7fbefc73d626868c45cdb0745e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 437/823] qalculate: rebuild for icu-69.1

---
 srcpkgs/qalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 4d9e490bf26d..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
 # and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From 2cf41bac040232044e282e42f10fc05e396dabdf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 438/823] qt5: rebuild for icu-69.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..ca47cb6952b4 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From 3e433c36917d2a0c4ed541b45f473475ba584174 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 439/823] qt5-webkit: rebuild for icu-69.1

---
 srcpkgs/qt5-webkit/patches/glib-2.68.patch |  26 ++++
 srcpkgs/qt5-webkit/patches/icu-68.patch    | 170 +++++++++++++++++++++
 srcpkgs/qt5-webkit/template                |   2 +-
 3 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch

diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

From d39f5d1389c1539ce19b250a4ed1cbd29e1836d3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 440/823] qt6-base: rebuild for icu-69.1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..d877eeb9b3a3 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6

From dc2ef100defcd309348c82fee296248d4fe644ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 441/823] qt6-qt5compat: rebuild for icu-69.1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "

From d7fb395c5e12831b060791b3a465bba77db2722b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 442/823] rspamd: rebuild for icu-69.1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From fb46418936e99d26a8bde242c842d19ac7273134 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 443/823] scribus: rebuild for icu-69.1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 359f27369af0bb32103e8bb4aa75be42c3b0a8a2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 444/823] sile: rebuild for icu-69.1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From 81a3f973d659bd719d91d8bd3ac1e85c019307d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 445/823] slop: rebuild for icu-69.1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From 23fabac1665d34b64811f890014c20547fecb969 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 446/823] sword: rebuild for icu-69.1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From a643d91d25cedb91da045ec523264484d413bba5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 447/823] tectonic: rebuild for icu-69.1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"

From 20722439975192b7c79d5800c8ae214a508d4cc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 448/823] tepl: rebuild for icu-69.1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"

From df53563d80e22647834579c0fe8665543ef8dfc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 449/823] tesseract-ocr: rebuild for icu-69.1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From a0776bc2c66d1cd5007dfda5bea7ac98b064c959 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 450/823] texlive: rebuild for icu-69.1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From db6239236042ad43e262f0ea277344035ddf1b78 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 451/823] thunderbird: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 

From 6c6206d0c86c944def8cc0b12a3a2e5ddfffc7c2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 452/823] tracker: rebuild for icu-69.1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From 1e7fc3fef814e42892579089f1cfa41333bf9cb1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 453/823] tracker-miners: rebuild for icu-69.1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 4531b1f9cdd97a7560e369ffbd145537fcede803 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 454/823] tracker3: rebuild for icu-69.1

---
 srcpkgs/tracker3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"

From be49e823d8a6e919b332f5aba5cf2093c0bf9b3d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 455/823] tracker3-miners: rebuild for icu-69.1

---
 srcpkgs/tracker3-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss

From 05537c8cf4ca987406aa7b25fddd36a003921370 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 456/823] unar: rebuild for icu-69.1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 542c6c75608d3ded60bb356726f5eb8b2078c788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 457/823] vte3: rebuild for icu-69.1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From 3f3897bc64ecfe902f0fa26ef702d9cdec119768 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 458/823] webkit2gtk: rebuild for icu-69.1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..bbe0d8ddca86 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From 44eedad7ebf46367d6542370b91557ba31b6e396 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 459/823] widelands: rebuild for icu-69.1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include

From 1f23a81c439d175654ee3483062a959129161dc9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 460/823] xerces-c: rebuild for icu-69.1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From fd491ddc30c15adc36b72f9a9616074fe70f0a7f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 461/823] yaz: rebuild for icu-69.1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From 35cec78e3b710031c4b1de1c4f1b3aa81270cd13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 462/823] znc: rebuild for icu-69.1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python

From 0526ac42096ee6cb8ea4dfbdef79e79f22a4306f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:57:08 +0200
Subject: [PATCH 463/823] removed-packages: drop nodejs-lts-10

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fa919b6de59b..cf88a864cba9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,7 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 9678af1819608e07fd0aaa6569921218f5ad2eaa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 15:01:15 +0200
Subject: [PATCH 464/823] rstudio: switch nodejs-lts

---
 srcpkgs/rstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel

From 139e78849548a200dddb797b7f23f2d1b95df443 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:08:27 +0200
Subject: [PATCH 465/823] firefox-esr-i18n: update to 78.13.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"

From ee71be1b59bb2fffafd61635e36c2725e2c384c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 466/823] qt5-webengine: update to 5.15.5, rebuild for icu-69.1

---
 .../patches/0120-QTBUG-91773.patch            | 372 ------------------
 .../0200-invalidate-old-v8-cache.patch        |  31 --
 srcpkgs/qt5-webengine/template                |  16 +-
 3 files changed, 9 insertions(+), 410 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch

diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"

From 536a35621a2e1ba51862ebc5f9f81a54e48f28f3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:51:45 +0200
Subject: [PATCH 467/823] firefox-i18n: update to 91.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 755b02d248c0..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0.1
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
- 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
- a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
- 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
- ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
- 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
- d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
- ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
- 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
- ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
- 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
- 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
- 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
- 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
- bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
- 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
- e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
- cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
- 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
- df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
- 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
- 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
- cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
- dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
- 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
- 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
- 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
- c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
- b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
- 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
- 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
- b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
- 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
- e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
- 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
- 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
- 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
- e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
- 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
- befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
- e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
- 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
- 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
- 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
- ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
- d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
- f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
- 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
- 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
- db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
- a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
- d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
- fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
- c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
- a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
- a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
- c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
- b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
- 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
- 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
- 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
- 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
- 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
- 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
- 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
- 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
- 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
- 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
- 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
- a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
- b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
- 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
- a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
- a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
- cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
- dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
- 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
- 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
- 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
- b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
- 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
- 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
- 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
- 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
- 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
- c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
- f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
- e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
- e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
- 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
- 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
- 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
- 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
- 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
- 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
- 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"

From c5b64c645023d56873c2aba234f5c86756dd9bce Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 468/823] 0ad: patch spidermonkey 78.6 for rust>=1.50, rebuild
 for icu-69.1.

Necessary in order to rebuild 0ad for libfmt.so.8.
---
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 ++++++++++++++++++
 srcpkgs/0ad/template                          |   2 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
new file mode 100644
index 000000000000..95007b32f25e
--- /dev/null
+++ b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
@@ -0,0 +1,107 @@
+From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
+From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 27 Feb 2021 09:31:17 +0000
+Subject: [PATCH] Patch SM78.6 for Rust 1.50
+
+Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
+(this fix is integrated in SM78.8)
+
+Reviewed By: s0600204
+
+Differential Revision: https://code.wildfiregames.com/D3590
+
+
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
+---
+ libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
+ libraries/source/spidermonkey/patch.sh        |  4 ++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 libraries/source/spidermonkey/FixRust150.diff
+
+diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
+new file mode 100644
+index 00000000000..cfb0d58b4a0
+--- /dev/null
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
+index 58be1fbdef0..879964b0f2e 100644
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..f6e6b41899de 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 2e3294fbfd45717df6e5436631be431e3c6451a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:08:09 -0300
Subject: [PATCH 469/823] R-cran-stringi: update to 1.7.3, rebuild for icu-69.1

---
 srcpkgs/R-cran-stringi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE

From e88802f7a1571c6a51a8005d5ecb70669dc40c59 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 Aug 2021 15:12:39 +0200
Subject: [PATCH 470/823] thunderbird-i18n: update to 78.13.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"

From a51ce0bff41274f7fffb76220be57c9428ff13d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 11:27:22 -0300
Subject: [PATCH 471/823] qt6-base: only add self to hostmakedepends for cross

Tools other than xbps-src might get confused and assume a build cycle,
even if xbps-src can deal with it.
---
 srcpkgs/qt6-base/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d877eeb9b3a3..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"

From e2708fbc0f6359cbf5737e76dfcade5360e4f84a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:36:26 +0200
Subject: [PATCH 472/823] nodejs-lts-10: remove stale symlink

---
 srcpkgs/nodejs-lts-10-devel | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/nodejs-lts-10-devel

diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file

From 4ccd4d2cb36fdb1051e85f411d1c5082c4bfb4aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:04:04 +0200
Subject: [PATCH 473/823] ripright: build with imagemagick7

---
 srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++
 srcpkgs/ripright/template                   | 14 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch

diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}

From f4f9230d80702d859c23254fea4e11d18b6985ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 22:05:44 +0200
Subject: [PATCH 474/823] New package: hello-2.10

---
 srcpkgs/hello/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/hello/template

diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b

From fd722dcdfdec5ece8560194886429fe0ba5568af Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Thu, 15 Apr 2021 21:30:58 -0400
Subject: [PATCH 475/823] nginx: configure with dynamic module support

---
 srcpkgs/nginx/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \

From 601649d05d5103cf63a56742bcbbb95efa0c506b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:18:27 +0300
Subject: [PATCH 476/823] spdx-licenses-list: update to 3.14.

Also fix license (thanks @paper42).
---
 common/travis/license.lst           | 14 ++++++++++++++
 srcpkgs/spdx-licenses-list/template |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx

From 50179be2dc1e9ee25bab01a57410b1e8898d5951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 477/823] New package: CUnit-2.1.3

---
 srcpkgs/CUnit-devel    |  1 +
 srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/CUnit/update   |  1 +
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update

diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'

From e3682033ec656e30f2cb1390b9d9c512c374a718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 478/823] postgis: update to 3.1.3, enable unit tests

---
 srcpkgs/postgis/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From ec1db23bdbd1d066e41e328454479aa5da997f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 479/823] postgis-postgresql12: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql12/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 15c007f9c99f56dadff9dbb6bc84d564950f221a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 480/823] postgis-postgresql13: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql13/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From b4f079cd60829e745888784e02c242deff8059bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 481/823] mosquitto: enable tests

---
 srcpkgs/mosquitto/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }

From 8db1ca112ad9ee9177a714d59fc2c879af0b0c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 Aug 2021 20:46:25 +0200
Subject: [PATCH 482/823] README.md: put chroot style information together,
 extend

---
 README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 

From d030b0e220630fa68da90f67878bc01b813455ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 11 Aug 2021 14:33:40 +0200
Subject: [PATCH 483/823] intellij-idea-ultimate-edition: update to 2021.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)

From 5a25fe84db5f0bbbf2c5915ae76d9c3a1a52abe4 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 12 Aug 2021 00:12:28 +0100
Subject: [PATCH 484/823] chezmoi: update to 2.1.5.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE

From d10d5af1bdd8775b25d369b70f51a6e56abf64d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 485/823] qt5: add libxml2-devel to makedepends

Trying to reorder cross-build.
Transitively dependencies via libxslt-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ca47cb6952b4..935a156b7d48 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel

From f8f90ca8d05ba3a914de0fb96acdcd4ec23b64e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 486/823] qt5: add libxml2-devel to hostmakedepends

Trying to reorder cross-build.
Transitively dependencies via wayland-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 935a156b7d48..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 

From 6b5a98bca31cfae98bb5cc99e0820b18b58d96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:16:15 +0700
Subject: [PATCH 487/823] harfbuzz: makedepends+=libxml2

Force builder to use staging libxml2
---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 6964948610fa..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -7,7 +7,7 @@ build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"

From b76f5bef8c7df303e8d20b67a209e65ce4a33ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:24:31 +0700
Subject: [PATCH 488/823] webkit2gtk: hostmakedepends+=libxml2-devel

See previous commit.
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index bbe0d8ddca86..951c1c9ee5ee 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From 3c9f521c95bbe9dff92dbeba71413d5fc7ab920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:31:19 +0700
Subject: [PATCH 489/823] webkit2gtk: hostmakedepend+=libpsl

Force libpsl from staging, (geoclue2->libsoup-gnome->libsoup->libpsl)
---
 srcpkgs/webkit2gtk/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 951c1c9ee5ee..837fd8130803 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From fa7e812d6f7dcbbd405ead900b878eabf5c90fc7 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Wed, 11 Aug 2021 23:11:31 -0300
Subject: [PATCH 490/823] icewm: update to 2.7.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 

From ea67c70c19c319611de0a7af1ddce7691b02964d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:17:08 +0400
Subject: [PATCH 491/823] osinfo-db: update to 20210809.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From ad4b4b362ecae61007d6258da79e0a918995fa6c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:25:10 +0400
Subject: [PATCH 492/823] benchmark: update to 1.5.6.

---
 srcpkgs/benchmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e45c13ae7ec955da50eb01a223661555ed968f28 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:11:39 +0400
Subject: [PATCH 493/823] python3-regex: update to 2021.8.3.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 83f291af2d03439cda2818210bf961d1f29769a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:03:54 +0300
Subject: [PATCH 494/823] skype: update to 8.75.0.140.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index d8e2f3a77606..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.74.0.152
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 

From 33f01abd29e96c0fa6c4cb481016bde8f5ea1651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 22:46:55 -0300
Subject: [PATCH 495/823] ptii: remove package.

Distfiles were never available officially. The git repo in [1] still
works, but seems inactive, and the homepage no longer works.

[1] git://z3bra.org/ptii
---
 srcpkgs/ptii/patches/fix-installpaths.patch | 15 ---------------
 srcpkgs/ptii/template                       | 14 --------------
 srcpkgs/removed-packages/template           |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template

diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cf88a864cba9..c9349197c278 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -230,6 +230,7 @@ replaces="
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
  psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From cd7fd20f07f9a0632bf93e34ed6e517d99d47fa9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 09:45:43 +0300
Subject: [PATCH 496/823] protontricks: update to 1.6.0.

---
 srcpkgs/protontricks/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}

From bbf15689d99be25b5d9609ad095c2b7199cd39f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 9 Aug 2021 20:28:29 +0200
Subject: [PATCH 497/823] libfilezilla: update to 0.31.1.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8d1e95f063ec..f96d3f36b3ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2588,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 290f5d1501b8c0881e2a36cc78f0c028626cb8d2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 16:29:47 +0200
Subject: [PATCH 498/823] filezilla: update to 3.55.1.

---
 srcpkgs/filezilla/patches/libtool_tag.patch | 11 -----------
 srcpkgs/filezilla/template                  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch

diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d4014c75337f83717f2fe87797b14b7d82955f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 21:32:12 +0700
Subject: [PATCH 499/823] OpenRCT2: makedepends+=libxml2-devel

Transitive via SDL2-devel -> wayland-devel
---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 8eeb3f75b528..1f4738bdc46a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"

From a1eb1dbb92cd6490cb5b8e8fe2733dd3e53bbb12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 22:03:55 +0700
Subject: [PATCH 500/823] OpenRCT2: force some hostmakedepends from staging for
 icu rebuild

---
 srcpkgs/OpenRCT2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 1f4738bdc46a..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 

From 3dc283c7c23c6632ddfbfc6218212a666bb97ed9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:17:03 +0200
Subject: [PATCH 501/823] warzone2100: update to 4.1.3.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index d878605ff26a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.2
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From b7bf44e1a89aa5fecf2eba4b666b025fa892d4cc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:21:19 +0200
Subject: [PATCH 502/823] linux5.4: update to 5.4.140.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c204d64759c3..9316ea45e0a8 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.138
+version=5.4.140
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
+checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 195ad0a4ed8201c3c43176397b77a01c6d097cbf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:23:51 +0200
Subject: [PATCH 503/823] linux4.19: update to 4.19.203.

---
 srcpkgs/linux4.19/template  |   4 +-
 srcpkgs/linux4.19/templateu | 331 ++++++++++++++++++++++++++++++++++++
 2 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux4.19/templateu

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b79ed782a91c..914f8f45b75f 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.201
+version=4.19.203
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}

From b52d8d996acb8d4b9aac680a0230866a21596e04 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:26:58 +0200
Subject: [PATCH 504/823] linux5.13: update to 5.13.10.

---
 srcpkgs/linux5.13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 2c8c80b9945f..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.9
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 8ee1ab3b5123e860aff832fe1b00a2f2fa5b9a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:31:43 -0400
Subject: [PATCH 505/823] python3-ciso8601: update to 2.2.0.

---
 srcpkgs/python3-ciso8601/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE

From 42435f958a5fa83a270588649d1087fa1d51a798 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:32:02 -0400
Subject: [PATCH 506/823] python3-tifffile: update to 2021.8.8.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 0e9e467e1564..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.30
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 

From 3decb15651195ddd18fcf1d926ee8dfaf0b89927 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:35:35 -0400
Subject: [PATCH 507/823] xpra: update to 4.2.2.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 8f99848d6d57e992173fd15ce2bf6805158f6ffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:37:27 -0400
Subject: [PATCH 508/823] python3-uvloop: update to 0.16.0.

---
 srcpkgs/python3-uvloop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient

From 31486f9f61c9282f4255f4abf3c0995a5298c2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:12 +0200
Subject: [PATCH 509/823] postgresql: update to 9.6.23, adopt.

---
 srcpkgs/postgresql/template | 8 ++++----
 srcpkgs/postgresql/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 6c30501a7c61..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"

From aed625668acd6d519e54907c20efd93b562c6386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:13 +0200
Subject: [PATCH 510/823] postgresql12: update to 12.8.

---
 srcpkgs/postgresql12/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bd3c6efc791346a273eaafad2a7ccab06ba9c498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:14 +0200
Subject: [PATCH 511/823] postgresql13: update to 13.4.

---
 srcpkgs/postgresql13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bfc6885ffbe6fd49b8b9166c284695210f545012 Mon Sep 17 00:00:00 2001
From: Justin Hibbits <chmeeedalf@gmail.com>
Date: Thu, 12 Aug 2021 13:20:16 -0500
Subject: [PATCH 512/823] claws-mail: update to 3.18.0

---
 srcpkgs/claws-mail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From b5751c606cf8fe914d994482d8989f65aeef28f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 12 Aug 2021 21:50:39 +0200
Subject: [PATCH 513/823] Aegisub: rebuild for icu

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)

From fbf27a5a0ca5bcc8986b3ac52626cf827c445405 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:02:33 +0200
Subject: [PATCH 514/823] unbound: update to 1.13.2.

---
 srcpkgs/unbound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {

From 6903859b90dc79aa413e9d329388bbb453757147 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:04:55 +0200
Subject: [PATCH 515/823] k9s: update to 0.24.15.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 5e0531b83dc6009199dc96bd7493ebc67b54fa61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:07:05 +0200
Subject: [PATCH 516/823] skaffold: update to 1.30.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 663f97e1f5f0..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.29.0
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764

From 4ad44630337495dceb4fd1ceb2ea465e48644037 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:11:48 +0200
Subject: [PATCH 517/823] netpbm: update to 10.95.01.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc

From 4a23979ca3b2ba8d84ff63ea0463d573d5586114 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Wed, 11 Aug 2021 02:42:38 +0200
Subject: [PATCH 518/823] libXft: update to 2.3.4

---
 srcpkgs/libXft/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING

From b262c7ceab89d11cbb09b50b49fd28250587de89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 22:14:29 +0200
Subject: [PATCH 519/823] dovecot: remove INSTALL{,.msg}, we don't ship a
 default config anymore

---
 srcpkgs/dovecot/INSTALL     | 9 ---------
 srcpkgs/dovecot/INSTALL.msg | 6 ------
 srcpkgs/dovecot/template    | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg

diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 27a781db5139..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From 8ce3d75f5dd89c33bd033499d8d16daa2a332709 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 5 Aug 2021 22:48:55 -0700
Subject: [PATCH 520/823] CLion: Fix removal of files for unsupported OS/archs

---
 srcpkgs/CLion/template | 43 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index f2ab575cea34..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
 version=2021.2
-revision=1
-archs="i686 x86_64"
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -25,36 +25,37 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/arm
-	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/ppc64le
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/yjpagent.dll
 	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
+	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
+	rm -rf lib/pty4j-native/linux/ppc64le
+
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/performanceTesting/bin/libyjpagent.so
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
 			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so

From 6635ad2495e6000853247d34f5a19d1d05e6b417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 09:46:45 +0700
Subject: [PATCH 521/823] icu: build static with -fPIC

---
 srcpkgs/icu/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index a05d0a7d35a8..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -3,7 +3,7 @@
 #       next soname bump.
 pkgname=icu
 version=69.1
-revision=1
+revision=2
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -18,6 +18,9 @@ homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
 checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
 fi

From e234634ed2daa31a2bce7585235d77c84a87fb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 13:35:07 +0700
Subject: [PATCH 522/823] enchant2: makedepends+="icu-devel"

Transitive via nuspell-devel anyway.
---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 59413b958747..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f49b7f83f0426aa50b278813e2df6113a2d8b33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 Aug 2021 12:51:06 +0200
Subject: [PATCH 523/823] linux5.10: update to 5.10.58.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6242d17550e8..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.56
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 93743856c7fd206837251863e004792d05994454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 19:11:28 +0700
Subject: [PATCH 524/823] webkit2gtk: makedepends+= libnuspell-devel
 libpsl-devel

Via libsoup-devel and enchant2-devel
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 837fd8130803..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -30,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"

From 8000175a12865c52db1534925823ec0418c8dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 Aug 2021 16:26:57 +0700
Subject: [PATCH 525/823] nss: update to 3.69.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 69a8fcc086acf2b39f836bc99f1309ec73dc8d7a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:10:17 +0200
Subject: [PATCH 526/823] thermald: update to 2.4.6.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 4dad19ff8b6f51c6f6972c88e3abf8ef79a82587 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:11:21 +0200
Subject: [PATCH 527/823] terraform: update to 1.0.4.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6

From f4c4d7d16dc07a8feb4047497af40b4b0bb8fc60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:13:38 +0200
Subject: [PATCH 528/823] terragrunt: update to 0.31.4.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt

From d5394b4d94931f5e69b411f228501f8afcbed75d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:15:31 +0200
Subject: [PATCH 529/823] hugo: update to 0.87.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 03cdeb450eae..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.86.1
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md

From 1dae0b40ce7d6fccc56e122d1492d4f8e7c8773a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:19:37 +0200
Subject: [PATCH 530/823] hopper: update to 4.8.2.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes

From dbd04054d8c7f8123bf6342601e915de8c285275 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:20:03 +0200
Subject: [PATCH 531/823] hivex: update to 1.3.21.

---
 srcpkgs/hivex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 1ed578d92e17..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,6 +1,6 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.20
+version=1.3.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes

From 17ca3f128a2307f8e30194efa3ac88877e0c210b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:36:28 +0200
Subject: [PATCH 532/823] iio-sensor-proxy: update to 3.1.

---
 ...heck-for-.pc-files-before-using-them.patch | 32 -------------------
 srcpkgs/iio-sensor-proxy/template             | 13 +++-----
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch

diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy

From a8b2089377cf66f79a90ed008a920a5c754ce3cf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 20:46:17 +0200
Subject: [PATCH 533/823] libkdcraw5: update to 21.08.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7908f9a215df4a1fbea2fa945fc0051c38d8eba6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 21:14:33 +0200
Subject: [PATCH 534/823] gwenview: update to 21.08.0.

---
 srcpkgs/gwenview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19

From d9f91db631b7e3baf864c159158c7e3e0d543dc3 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 12 Aug 2021 22:20:02 +0530
Subject: [PATCH 535/823] Komikku: add patch from upstream

---
 srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ++++++++++++++++++++++
 srcpkgs/Komikku/template                   |  2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch

diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 7a612602214d..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.30.0
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From 9212918f8838f5debf3c73d7ac2f456d39053bf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 3 Aug 2021 08:56:18 +0300
Subject: [PATCH 536/823] xf86-video-amdgpu: update to 21.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }

From ef0f5863d8a296c84f4328fba1b97fe84e8ad25e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:37:05 +0200
Subject: [PATCH 537/823] meld: update to 3.20.4.

---
 srcpkgs/meld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \

From 1a82699f5d2a897ef28951897761d1656e024cc3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:07 +0200
Subject: [PATCH 538/823] 0ad-data: update to 0.0.25.

---
 srcpkgs/0ad-data/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in

From f040aff7bfacdaa61e87b9303f80a9ba16266f8e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:24 +0200
Subject: [PATCH 539/823] 0ad: update to 0.0.25.

---
 srcpkgs/0ad/patches/ppc64.patch               | 113 ------------------
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 -----------------
 srcpkgs/0ad/template                          |   6 +-
 3 files changed, 3 insertions(+), 223 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
deleted file mode 100644
index 95007b32f25e..000000000000
--- a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
-From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 27 Feb 2021 09:31:17 +0000
-Subject: [PATCH] Patch SM78.6 for Rust 1.50
-
-Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-(this fix is integrated in SM78.8)
-
-Reviewed By: s0600204
-
-Differential Revision: https://code.wildfiregames.com/D3590
-
-
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
----
- libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
- libraries/source/spidermonkey/patch.sh        |  4 ++
- 2 files changed, 69 insertions(+)
- create mode 100644 libraries/source/spidermonkey/FixRust150.diff
-
-diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
-new file mode 100644
-index 00000000000..cfb0d58b4a0
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixRust150.diff
-@@ -0,0 +1,65 @@
-+
-+# HG changeset patch
-+# User Emilio Cobos Álvarez <emilio@crisal.io>
-+# Date 1609006565 0
-+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-+# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-+
-+Fixes errors like:
-+
-+  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-+
-+I've left the most specific dependency, but for wgpu the rev is not
-+right, so I've kept the branch which effectively preserves behavior.
-+
-+Differential Revision: https://phabricator.services.mozilla.com/D100485
-+
-+diff --git a/.cargo/config.in b/.cargo/config.in
-+--- a/.cargo/config.in
-++++ b/.cargo/config.in
-+@@ -1,16 +1,16 @@
-+ # This file contains vendoring instructions for cargo.
-+ # It was generated by `mach vendor rust`.
-+ # Please do not edit.
-+ 
-+ [source."https://github.com/shravanrn/nix/"]
-+-branch = "r0.13.1"
-+ git = "https://github.com/shravanrn/nix/"
-+ replace-with = "vendored-sources"
-++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ 
-+ [source."https://github.com/mozilla/rkv"]
-+ git = "https://github.com/mozilla/rkv"
-+ replace-with = "vendored-sources"
-+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
-+ 
-+ [source."https://github.com/mozilla/neqo"]
-+ git = "https://github.com/mozilla/neqo"
-+diff --git a/Cargo.lock b/Cargo.lock
-+--- a/Cargo.lock
-++++ b/Cargo.lock
-+@@ -3200,7 +3200,7 @@
-+ [[package]]
-+ name = "nix"
-+ version = "0.13.1"
-+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ dependencies = [
-+  "bitflags",
-+  "cc",
-+diff --git a/Cargo.toml b/Cargo.toml
-+--- a/Cargo.toml
-++++ b/Cargo.toml
-+@@ -60,8 +60,8 @@
-+ [patch.crates-io]
-+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
-+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
-+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
-+ # failure's backtrace feature might break our builds, see bug 1608157.
-+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+
-diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
-index 58be1fbdef0..879964b0f2e 100644
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
- patch -p1 < ../FixRpiUnalignedFpAccess.diff
- 
-+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-+# Note that this isn't quite the upstream patch to match our version.
-+patch -p1 < ../FixRust150.diff
-+
- # Patch those separately, as they might interfere with normal behaviour.
- if [ "$(uname -s)" = "FreeBSD" ];
- then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f6e6b41899de..2e095d293a6a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
-revision=3
+version=0.0.25
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 

From d303ec56631d7e5e294752fba40b767c9546bb2d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 13:22:34 +0200
Subject: [PATCH 540/823] youtube-viewer: update to 3.9.4.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 631d508f2d7f227cbd47bf51fbbc1c2e80de865e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 14:52:02 +0200
Subject: [PATCH 541/823] knot: update to 3.1.1.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 2188e92dac8b..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 7c493688a8f472de21012b1cd47469115013408d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 15:05:28 +0200
Subject: [PATCH 542/823] wine: update to 6.15.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 30be01e169b2..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.14/dlls/dnsapi/libresolv.c
-+++ b/wine-6.14/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2fa789c7e7..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.14
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
- 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 4624952c79c5813577aef7ec2c948d9b0e9d77b6 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 7 Aug 2021 10:17:38 -0600
Subject: [PATCH 543/823] combine mu and mu4e packages and update to 1.6.3

- combine mu and mu4e packages under (more discoverable) name "mu4e"
  - add `replaces`/`provides` for old "mu" package
- add option for optional guile components
- update to 1.6.3
---
 srcpkgs/mu/template   | 36 ------------------------------------
 srcpkgs/mu4e          |  1 -
 srcpkgs/mu4e/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 36d67ef65cba..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}

From 8f53dc8d60eb3b2e9da062cafeb5cfb409fac9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 544/823] filelight: update to 21.08.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4

From d753b84fb79b7266c1793e9fff39b443afc6cec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 545/823] kaccounts-integration: update to 21.08.0.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From f8128b7a9938cdeabbbc30181123d89a7a421712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 546/823] kaccounts-providers: update to 21.08.0.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 09f2a9c0ce337662bf17a1eb7e800cf320528df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 547/823] kcachegrind: update to 21.08.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2

From a523dbe991eacb2379ef1436aa43110160c2d87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 548/823] kcron: update to 21.08.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4

From 759a233dd267718e423b35d0ec16afc5efc0a3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 549/823] kdialog: update to 21.08.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de

From 6fff1b8760ce35609febe12d11241b4f7de426ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 550/823] keditbookmarks: update to 21.08.0.

---
 .../patches/20.08.3--fix-tests.patch          | 28 -------------------
 srcpkgs/keditbookmarks/template               |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch

diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc

From 0ebc5d7c8fa2cc90a9faba8e87cb197fd71f7c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 551/823] kfind: update to 21.08.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461

From ca77c8b9e0de0769062b41ad6863ec8197ebf44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 552/823] kig: update to 21.08.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4

From 8d65798109dad3689363d30693c42ed2775c365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 553/823] kio-gdrive: update to 21.08.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa

From 6e9f98030fd77c3a95e0588410124bbb2115887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 554/823] kmag: update to 21.08.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91

From c23c5eb633c0863d7c93470078ff540287d6b5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 555/823] kmix: update to 21.08.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad

From 04b2fa8bab48801e2a9c6c50b79e95821d32b5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 556/823] kolourpaint: update to 21.08.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING

From b67a82596d7e1e7db017bc73510539951ec39587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 557/823] kompare: update to 21.08.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4

From 55350a62182af8942d27ae750c34ddea3364ba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 558/823] kpat: update to 21.08.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2

From 07076e646b0321e9d99a5614fe2ea371a90af314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 559/823] kruler: update to 21.08.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af

From ec6e6a94dbd86906a4042717bcf0d4facc978605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 560/823] ksystemlog: update to 21.08.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2

From a67a78dcb80db1694f064b6489941a6bb30fd33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 561/823] kteatime: update to 21.08.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546

From f5301e3f9a2f13fbd723c55636bd141595839e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 562/823] kturtle: update to 21.08.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e

From a57b46c2a7e7b5c6cecdd159d5a0816bcffd8e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 563/823] kwalletmanager: update to 21.08.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963

From fbf62ded4171c457cfe742648e47113f9c68217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 564/823] libkcddb: update to 21.08.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 35b2baae3999832242fa7c48dd858cf75a090484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 565/823] libkdegames: update to 21.08.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f4c118f85c5f1b6a4534898367090d8566ec1b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 566/823] libkomparediff2: update to 21.08.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 819515e0d1f62b50225614992c4014fda5bfcc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 567/823] marble5: update to 21.08.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 40cc4d049a5ca782a967e89ae94efc0fe0ed8de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 568/823] signon-kwallet-extension: update to 21.08.0.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72

From 7369027cd40dd65dba61fb57ef4371cf363f891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 569/823] svgpart: update to 21.08.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102

From ec414ed70833a5b264fd0ad20d4212f0c7e465e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 570/823] umbrello: update to 21.08.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {

From c29ff7224c8b1a82658af9f323f07d0af6603294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 571/823] yakuake: update to 21.08.0.

---
 srcpkgs/yakuake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 61d6e2e645c4..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,7 +1,7 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
-revision=2
+version=21.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e

From bbc686bb5d1319cc3b458e2ae19abd2373881839 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:45:03 +0200
Subject: [PATCH 572/823] linux4.19: update ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 068acd4303087f3926c48f8cccd71300c58552da Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:40:57 +0200
Subject: [PATCH 573/823] linux5.4: update ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 39461a28097f52942e263a12c2021b141ffcd1bb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:43:14 +0200
Subject: [PATCH 574/823] linux5.13: update ppc-dotconfig

---
 srcpkgs/linux5.13/files/ppc-dotconfig | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

From bff15f3d98a9813dc6c26d5f43e23d51cc3acc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 22:49:10 +0700
Subject: [PATCH 575/823] apostrophe: depends on webkit2gtk

---
 srcpkgs/apostrophe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 10c5d6f1c414bd49cd9a5d846c20be1cd8ec952c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 21:51:15 +0700
Subject: [PATCH 576/823] python3-pypandoc: update to 1.6.3.

---
 srcpkgs/python3-pypandoc/patches/no-pip.patch | 20 +++++++++++++++++++
 srcpkgs/python3-pypandoc/template             |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch

diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE

From cc8eb3744a96c36eda0584eaf8e812c2030c2ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:19 +0700
Subject: [PATCH 577/823] python3-usb: update to 1.2.1.

---
 srcpkgs/python3-usb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE

From e07d6dd0f6dbece44f014e7d9f21596d365cac5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:23 +0700
Subject: [PATCH 578/823] python3-elementpath: update to 2.2.3.

---
 srcpkgs/python3-elementpath/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling

From 49796352785b22c246aebf266afafe93ab24d05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:38 +0700
Subject: [PATCH 579/823] python3-pyscard: update to 2.0.1.

---
 srcpkgs/python3-pyscard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 

From 2a4c01d6d395638493880bb818f171d441de03d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:13:50 +0700
Subject: [PATCH 580/823] sip: update to 6.1.1.

---
 srcpkgs/sip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From c6dd168e9c0795eac3ea033d8ecefabe74a0f95e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 Aug 2021 18:54:54 +0200
Subject: [PATCH 581/823] python3-boto3: update to 1.18.21.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE

From 4b2981744107e2329f4f93b7f295aaaa41b1ab00 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 18:36:44 +0200
Subject: [PATCH 582/823] onionshare: remove package

* doesn't work with Flask 2
---
 srcpkgs/onionshare/template       | 23 -----------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/onionshare/template

diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c9349197c278..3b1dbd467489 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -219,6 +219,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4

From ee853fe00a61519dfdd9651c42dcf74fcbab405c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:33 +0200
Subject: [PATCH 583/823] python3-urwidtrees: update to 1.0.3.

---
 srcpkgs/python3-urwidtrees/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a

From b51e816cc26325f4ba577655fe5d53b70f9d55e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:36 +0200
Subject: [PATCH 584/823] stig: update to 0.12.2a0, adopt

---
 srcpkgs/stig/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged

From caac0c84ee55556a6cb776e1d09331d802650176 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 11 Aug 2021 15:13:07 +0100
Subject: [PATCH 585/823] gopls: update to 0.7.1.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE

From d979203bdde59ded044446ea65e27008fc4a0fc0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 14 Aug 2021 20:39:23 +0200
Subject: [PATCH 586/823] ccextractor: update to 0.92

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {

From 78a59e5314e856d316585e4ffedcc71122f48a6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 Aug 2021 11:29:10 -0400
Subject: [PATCH 587/823] python3-matplotlib: update to 3.4.3.

---
 srcpkgs/python3-matplotlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From c31ffeda77396ed711c7d6e616c6a6b24975b83e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 14 Aug 2021 15:42:28 -0500
Subject: [PATCH 588/823] New package: vault-acme-0.0.8.

---
 srcpkgs/vault-acme/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/vault-acme/template

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}

From 2ee53f90094f0c2fa3213b7c6e1f3a54f6318b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 10 Aug 2021 19:56:34 -0300
Subject: [PATCH 589/823] pari: update to 2.13.2.

- enable pthreads build
- switch gp binary to static link libpari; this offsets the slowdown due
  to pthreads
- use -flto and -fno-semantic-interposition which improve speed a little
  bit more
- ship the static library, so external programs can static link
- change of maintainer agreed by sgn

I had to add a minimal patch to the makefile, so that the build step
builds and the install step installs. I will try to upstream that patch.
---
 common/shlibs                       |  1 +
 srcpkgs/pari/patches/makefile.patch | 36 +++++++++++++++++++++++++++++
 srcpkgs/pari/template               | 22 +++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/pari/patches/makefile.patch

diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..301649ded872 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3981,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From ec9683ea5e257d5ac085ca9f6e3693341f86dfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:06:12 -0300
Subject: [PATCH 590/823] giac: revbump for pari

---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ++++++++++++++++
 srcpkgs/giac/template                |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel

From c28d6c6bba4b9f1dde2203dae3e5231ce2fedf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:13:17 -0300
Subject: [PATCH 591/823] qcas: revbump for giac

---
 srcpkgs/qcas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"

From 4e3ef46d6db0a74b28a5f10c72e4ba54700d6651 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 14 Aug 2021 23:34:04 +0200
Subject: [PATCH 592/823] sequeler: update to 0.8.2.

---
 srcpkgs/sequeler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876

From e78ea204eee7715310675231064fa709f830efdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:49 +0200
Subject: [PATCH 593/823] dolphin: update to 21.08.0.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From d78bf319fc55fb69538bfca0fab61d411277266c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:55 +0200
Subject: [PATCH 594/823] akonadi-calendar: update to 21.08.0.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c60065df21d701fc391e8047366dd8744d0f37dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:57 +0200
Subject: [PATCH 595/823] akonadi-contacts: update to 21.08.0.

---
 srcpkgs/akonadi-contacts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 8d1093b15a98c6d186ba6fe7c88051cca4f62b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:58 +0200
Subject: [PATCH 596/823] akonadi-import-wizard: update to 21.08.0.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 835db1dd9696474b57e7640b5b54a9f91d9e2e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:00 +0200
Subject: [PATCH 597/823] akonadi-mime: update to 21.08.0.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 57761126efd9ad7bd7a87c815c976d8848cd918d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:01 +0200
Subject: [PATCH 598/823] akonadi-notes: update to 21.08.0.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 614fe6632bf9f86b8d3e1976ad65c1157fda93de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:02 +0200
Subject: [PATCH 599/823] akonadi-search: update to 21.08.0.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b864620d3eb685f9c1824bc90406e17ac4e3ffb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:04 +0200
Subject: [PATCH 600/823] calendarsupport: update to 21.08.0.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 63e06a6086cb2d6dd04f75e6664ec5b29ff05caf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:05 +0200
Subject: [PATCH 601/823] grantleetheme: update to 21.08.0.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 89c7debabf8b9c1df4c6c529e7c984e67d5797b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:07 +0200
Subject: [PATCH 602/823] kalarmcal: update to 21.08.0.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From fe440257543b665ca49274bdf7dfd91c8a69adb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:08 +0200
Subject: [PATCH 603/823] kcalutils: update to 21.08.0.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5f2f5b27675e6ff8fe02f1759a835d5e7739c1ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:10 +0200
Subject: [PATCH 604/823] kdepim-runtime: update to 21.08.0.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 11131da4d33476ce2cd2902c26860716ee5e21c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:11 +0200
Subject: [PATCH 605/823] kimap: update to 21.08.0.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From cb3097c23cf363a91bed327dee9f1278daa8b3e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 606/823] kldap: update to 21.08.0.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e61c7cbf7fb6b0efd964adaa4fbd95be70a31e62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 607/823] kmail: update to 21.08.0.

---
 srcpkgs/kmail/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca

From 058a491eedd0f621e55cc64f7859cd88e39f866c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:15 +0200
Subject: [PATCH 608/823] kmail-account-wizard: update to 21.08.0.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93

From 94f06479a3992c016230089f355a3f87fd2ca448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:16 +0200
Subject: [PATCH 609/823] kmailtransport: update to 21.08.0.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 26dd67a9164bc031c13a2ebee9b3dd54b317dc9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:17 +0200
Subject: [PATCH 610/823] kmbox: update to 21.08.0.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From de9d9c3b16fd6afdeb8e710f37963cf560326219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 611/823] kmime: update to 21.08.0.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 4ef06ca0dc38d489d551405d8cebf1085d5b0011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 612/823] kde5-baseapps: update to 21.08.0.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="

From a4e744d183e561e3810d323bd78b5ff62ff225ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:20 +0200
Subject: [PATCH 613/823] kontactinterface: update to 21.08.0.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d27be916d104f83e756cd108a82d36dc6399ad0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:21 +0200
Subject: [PATCH 614/823] ksmtp: update to 21.08.0.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e0257d64cf740805fbdcadc5375bf0979821d7fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:23 +0200
Subject: [PATCH 615/823] ktnef: update to 21.08.0.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c54ec5382ea58e513b0ae3cd4b93168c2ebec9e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 616/823] kate5: update to 21.08.0.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 9cf6ba829ce663762c7e4e55f2a9cb6dd5e730d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 617/823] libgravatar: update to 21.08.0.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8797bd702e7f1cd1ceadb514e930cdd3604bfc2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:25 +0200
Subject: [PATCH 618/823] konsole: update to 21.08.0.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From bcb448211a2495d8066836723ca539ca64918cc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:26 +0200
Subject: [PATCH 619/823] libkdepim: update to 21.08.0.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 468616be217df0c41d6c5ed0cd0209ce3fa608d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 620/823] baloo-widgets5: update to 21.08.0.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From a0988bb2e9366cd3cc7a7e633ee6b611c88819ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 621/823] libkgapi: update to 21.08.0.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:

From 21f59b4873d5664f50ead6525aa7b915b34e4a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:28 +0200
Subject: [PATCH 622/823] kio-extras: update to 21.08.0.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d

From a4aa6c2b95334d923f1399cab0c16608e061d51f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:29 +0200
Subject: [PATCH 623/823] libkleo: update to 21.08.0.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e960bdc1a56b15d16ec50a01e66e1fc8912d1e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:31 +0200
Subject: [PATCH 624/823] okular: update to 21.08.0.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build

From d35ac3b69236c74957e71ac9466d5656eac94bc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 625/823] kleopatra: update to 21.08.0.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test

From 9de158a52808919d39908353ea7c00bf36bc2232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 626/823] libkexiv25: update to 21.08.0.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From b1d9dafc24f0f12a9fcf0b89abb44b02fb098965 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:33 +0200
Subject: [PATCH 627/823] libksieve: update to 21.08.0.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f043a73e4273a6bc0e3f84850878bc2e53a999f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:35 +0200
Subject: [PATCH 628/823] mailcommon: update to 21.08.0.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 1063c6ec22a0021d3db7a6880d95bd2084b76288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:36 +0200
Subject: [PATCH 629/823] spectacle: update to 21.08.0.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3

From 1ff4996abe4ab41b343f315ca72b33824d0b83c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:38 +0200
Subject: [PATCH 630/823] libkipi5: update to 21.08.0.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 8fda997448eab42e1d93e705cb328b308e2a9688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:39 +0200
Subject: [PATCH 631/823] messagelib: update to 21.08.0.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 

From 2775b48313e7e44f3789921c04c72a481277f643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:40 +0200
Subject: [PATCH 632/823] pimcommon: update to 21.08.0.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 65ac8e860ddba67db7d2dca42fed955c6db10a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:42 +0200
Subject: [PATCH 633/823] kpimtextedit: update to 21.08.0.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 710de4475b5c2ced45bdad7dc071ca6c976d8196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:43 +0200
Subject: [PATCH 634/823] kidentitymanagement: update to 21.08.0.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 5a0fefdf0ba944aa7373117aeb6a1c029469279b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:45 +0200
Subject: [PATCH 635/823] akonadi5: update to 21.08.0.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 354ada6ff88605a0fa106f6ebeb5a159939670ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:46 +0200
Subject: [PATCH 636/823] pim-data-exporter: update to 21.08.0.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d

From 3a101032252415b8789301dc62dd3a5e31d5f19d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:06 +0200
Subject: [PATCH 637/823] dolphin-plugins: update to 21.08.0.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4

From 591550f8e53b644e3924701db22636268ed433b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:12 +0200
Subject: [PATCH 638/823] mailimporter: update to 21.08.0.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 900ab560fdabf75643ff6b6b816ae7b995e775ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:52:44 +0200
Subject: [PATCH 639/823] khelpcenter: update to 21.08.0.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 18ffdbb0bb25777fc2cc2915c6d29908648a1246 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:56 +0200
Subject: [PATCH 640/823] ark: update to 21.08.0.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build

From c301c6d3b4adc1da88b3fa3c3e39843bb3276383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:58 +0200
Subject: [PATCH 641/823] elisa: update to 21.08.0.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1fb56de03284c99da04ecef211de3bf1c0fcb63b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:00 +0200
Subject: [PATCH 642/823] kdeconnect: update to 21.08.0.

---
 srcpkgs/kdeconnect/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3

From f8139ae47746efff68c06859067c3a15ecefc208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:01 +0200
Subject: [PATCH 643/823] kdegraphics-thumbnailers: update to 21.08.0.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab

From 01e4e04c9db391b521c1e19645f19acfdd654d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:03 +0200
Subject: [PATCH 644/823] knights: update to 21.08.0.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3

From daecacf95faca11c2fa226840d9262d176f78c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:04 +0200
Subject: [PATCH 645/823] kqtquickcharts: update to 21.08.0.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d9ac04925c82400ef2b88d59684a7eae87d324b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:41 +0200
Subject: [PATCH 646/823] gespeaker: remove package

doesn't work with espeak-ng
---
 srcpkgs/gespeaker/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/gespeaker/template

diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15

From ae7d3175bc19a6bd23e61dc3520a54989e2a2721 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:54 +0200
Subject: [PATCH 647/823] removed-packages: add gespeaker

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b1dbd467489..292ffc7ea954 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -69,6 +69,7 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1

From ebed12cd4a5c3f6ffbdca8486af5ed443f719b29 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 14 Aug 2021 01:26:36 +0300
Subject: [PATCH 648/823] bmake: update to 20210808.

---
 srcpkgs/bmake/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ef3463e7e554..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210803
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {

From 02dd3d09f1d29734bdcc2c0946705d08f95c1dd0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 14 Aug 2021 11:46:36 +0200
Subject: [PATCH 649/823] ardour: update to 6.9.

---
 srcpkgs/ardour/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"

From 178bdd212e3ef94478d24c04695099bfb4846a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:27:14 +0200
Subject: [PATCH 650/823] doomretro: update to 4.2.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251

From 14c3ed95f9008695845252af7068464c01fb6be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:36:47 +0200
Subject: [PATCH 651/823] exiftool: update to 12.30.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f

From 819e759ab49df8fa6c114633f8ba8f43d8357627 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 15 Aug 2021 17:51:22 +0700
Subject: [PATCH 652/823] kamoso: update to 21.08.0

---
 srcpkgs/kamoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602

From f2e0b10d1174742bcc866d5c0fecb2e3cb4cac42 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 19:23:52 +0300
Subject: [PATCH 653/823] evilwm: update to 1.3.1.

---
 srcpkgs/evilwm/files/evilwm.desktop | 11 -----------
 srcpkgs/evilwm/template             | 17 +++++++++--------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop

diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }

From 9a3759752e37d746fe81db23b9a0fdae3ad0826c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:20:00 +0200
Subject: [PATCH 654/823] zathura-pdf-mupdf: update to 0.3.7

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..256a5d51f883 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
-revision=2
+version=0.3.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
 LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"

From 8b924b59393fc0bb4f1da6e456aa601c51189d16 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:21:42 +0200
Subject: [PATCH 655/823] zathura-ps: update to 0.2.7

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE

From 0fd004294a119c140fd53f831e92bae8f96c5576 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 13 Aug 2021 08:50:01 +0200
Subject: [PATCH 656/823] xmobar: update to 0.39

---
 srcpkgs/xmobar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 87afe34b69f6a143b4d1816e27955bf45d12f65b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 12 Aug 2021 16:58:56 +0300
Subject: [PATCH 657/823] libjpeg-turbo: update to 2.1.1.

---
 srcpkgs/libjpeg-turbo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From a9731c17e327e6c2ad700673ce35e7176cfcb57c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 658/823] x265: update to 3.5.

---
 common/shlibs         |  2 +-
 srcpkgs/x265/template | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 301649ded872..42fd333f33b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi

From 4e9f6f105f2c31e89333cbadd0fe0c465e2876ad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 659/823] ffmpeg: revbump for x265

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 792fb7290d4871457cd84725f0c1e98f14d4d8b8 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 660/823] vlc: revbump for x265

also add ci-skip due to fail on test/run_vlc.sh
---
 srcpkgs/vlc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"

From e05d74ad6dcfd7ed337adcf7ad80334b765ccd09 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 661/823] libheif: revbump for x265

---
 srcpkgs/libheif/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"

From b081e58bbe8e7f5ad79ec6a6154d0c440309bdf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 662/823] handbrake: revbump for x265

---
 srcpkgs/handbrake/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden

From 9d7463b59ba7f71296dd3d323cbc0c113763b865 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 663/823] gst-plugins-bad1: revbump for x265

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 6c9e2ac11a83bc2955181e9969bb50a0df33d190 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 664/823] avidemux: revbump for x265

---
 srcpkgs/avidemux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"

From 3a51724b41f507370e1287dacc5f8ca262b263d2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 17:20:59 -0400
Subject: [PATCH 665/823] spotify-qt: update to 3.7.

---
 .../spotify-qt/patches/disable-crash-handler.patch | 14 ++++++++++++++
 srcpkgs/spotify-qt/template                        |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch

diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8

From eef9c0c820a80154b0e84fe6dc1c966a3a6e144b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 15 Aug 2021 23:56:48 +0200
Subject: [PATCH 666/823] lagrange: update to 1.6.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 15992e57dbaa..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.2
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md

From 867c04369c5ee4324d553d47ce06bec4b91e2f84 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:43 +0400
Subject: [PATCH 667/823] fmt: update to 8.0.1.

---
 common/shlibs        | 2 +-
 srcpkgs/fmt/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42fd333f33b9..d24c2bacbc9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE

From 019a84a94e9d592e31f3919275dd45f1c4cd371f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 668/823] spdlog: update to 1.9.1.

---
 srcpkgs/spdlog/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"

From 6a646d75fe9ac6531c6b5bbe6185010c9e5f828a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 669/823] cherrytree: rebuild against libfmt.so.8

---
 srcpkgs/cherrytree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 8789cd37dba7..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=0.99.39
-revision=1
+revision=2
 wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"

From e8d16a2335617d3ca804e3702322dd3fe29716c6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 670/823] Waybar: rebuild for libfmt.so.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 +++++++++++++++++++
 srcpkgs/Waybar/template                       |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}

From 06928a0fc668aba2d235d0e17325708ee29d604e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 671/823] gerbera: rebuild against libfmt.so.8

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From 55445ac53e9b4ed1d91d313ac6847915dce83da4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 672/823] kodi: fold kodi-rpi into it, rebuild for libfmt.so.8

We don't want to maintain kodi 18.x into eternity (which would start
with patching it correctly for libfmt.so.8), and, as explained in
9f8647640b3ce3e4a99f0ba7022eb6d55ba77c97, current kodi can't be built
for rpi specifically anymore. We will assume normal kodi is enough.
---
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 ---
 .../patches/add-missing-includes.patch        |  10 --
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 ------
 .../disable-static-texturepacker-build.patch  |  11 --
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 -----------
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 --
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 --
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 ---
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 ------
 srcpkgs/kodi-rpi/template                     | 119 ------------------
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 ++
 srcpkgs/kodi/template                         |   8 +-
 17 files changed, 15 insertions(+), 364 deletions(-)
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

From 94af74f98abffb0dc18c7803d9a755330fe161fc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 673/823] mkvtoolnix: rebuild against libfmt.so.8

---
 srcpkgs/mkvtoolnix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0875991a872f..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=60.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt

From fe75f492fb5d4344d3223ad6873624e3fc436543 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 674/823] nheko: rebuild against libfmt.so.8

---
 srcpkgs/nheko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel

From ff0dfc66165192471af70cb8640049b3099ea5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 8 Aug 2021 18:38:31 -0300
Subject: [PATCH 675/823] cryfs: rebuild against libfmt.so.8

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d8f855a80af..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

From 1b91642c8c52a1904f911be63a7ea898e74762f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 18:31:05 -0300
Subject: [PATCH 676/823] 0ad: rebuild against libfmt.so.8

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 2e095d293a6a..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.25
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 0d66ebda9af3e5d6f0bc78d8b2f6d34cb22c8a52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 20:22:27 -0400
Subject: [PATCH 677/823] zathura-pdf-mupdf: depends on gumbo now

---
 srcpkgs/zathura-pdf-mupdf/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 256a5d51f883..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,11 +1,12 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
 version=0.3.7
-revision=1
+revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -15,8 +16,6 @@ distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.t
 checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }

From a3833c178ef0ae3fe99aa21e647928d533970260 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:13:43 +0200
Subject: [PATCH 678/823] gucci: update to 1.5.0.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..58cdb9f09567 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
 
 post_install() {
 	vlicense LICENSE

From 6146d97a1abd17233b9ad813ef5a69162fe5246e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:14:43 +0200
Subject: [PATCH 679/823] python3-pyinfra: update to 1.4.12.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index b7c5bebb3e56..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.11
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 0ac449e9d9ff17d5c1401deeeefb9a960458ec66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:17:01 +0200
Subject: [PATCH 680/823] openbsd-netcat: update to 1.217.1.

---
 srcpkgs/openbsd-netcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From b20e341847734fcd18d55b45e3499a2f2caed0ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 13:10:03 +0200
Subject: [PATCH 681/823] gucci: fix checksum.

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 58cdb9f09567..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE

From d82e0b4f3787f56dbe28f0bf4ae90bdf68d6519c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:52:54 +0300
Subject: [PATCH 682/823] New package: libdecor-0.1.0_1

---
 common/shlibs             |  1 +
 srcpkgs/libdecor-devel    |  1 +
 srcpkgs/libdecor/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template

diff --git a/common/shlibs b/common/shlibs
index d24c2bacbc9e..befa6484dfee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,4 @@ liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From bbcbbeaec95ea31fcb759fadcf9a474be13190b0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:53:28 +0300
Subject: [PATCH 683/823] SDL2: update to 2.0.16.

---
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch | 32 +++++++++++++++++++
 srcpkgs/SDL2/template                         | 24 +++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch

diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi

From e8a936defab94d59c64ebcf0a1ad8e33dc4abbdf Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Fri, 13 Aug 2021 13:48:11 +0200
Subject: [PATCH 684/823] pandoc: update to 2.14.0.3

---
 srcpkgs/pandoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes

From 2e5f7e7179a68671dd08480535e3b6d06be7af9e Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 16 Aug 2021 17:47:30 +0100
Subject: [PATCH 685/823] font-iosevka: update to 10.0.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 1388c2af3ccd..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=9.0.1
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
-df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
-be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 315555c5ace34fb7a8f06c7bdc3059ada89baab7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:38 +0200
Subject: [PATCH 686/823] attica: update to 5.85.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build

From 297a51d7e6760c1b4f924366b3f8935894c129bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:39 +0200
Subject: [PATCH 687/823] baloo5: update to 5.85.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build

From eaad4ed9eaa001ac52e9dd19ca6327b88a1c1306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:40 +0200
Subject: [PATCH 688/823] bluez-qt5: update to 5.85.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build

From 4ffbb41c2271a1b72d19bbabed45db58654b5d42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:42 +0200
Subject: [PATCH 689/823] breeze-icons: update to 5.85.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 9bb4588b16b6c53e2b6fb9339c6379899275d56c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:43 +0200
Subject: [PATCH 690/823] extra-cmake-modules: update to 5.85.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {

From 90378019b590c05c84e9198972eac9fc66d2ab18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:45 +0200
Subject: [PATCH 691/823] frameworkintegration: update to 5.85.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From f93152fbcf2e8ec8fdcf9f70bb937a7979481c20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:46 +0200
Subject: [PATCH 692/823] kactivities5-stats: update to 5.85.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c6e0a35f1eb4c4b430f43dfc729b476f442b0cbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:48 +0200
Subject: [PATCH 693/823] kactivities5: update to 5.85.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 0caf0735441330851821931f791b398307087954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:49 +0200
Subject: [PATCH 694/823] kapidox: update to 5.85.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 2654859f4f9d8fb5e97f337a096319834a3abf93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:51 +0200
Subject: [PATCH 695/823] karchive: update to 5.85.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2481e284dae555bbbac6fe5cb82aeeaad3915326 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:52 +0200
Subject: [PATCH 696/823] kauth: update to 5.85.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build

From 78c8468ccc6bfedd0e21fe1dafefcadf4dbd5a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:53 +0200
Subject: [PATCH 697/823] kbookmarks: update to 5.85.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 7bbcdcca1090e9690fa314c95086f7b3a5995622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:55 +0200
Subject: [PATCH 698/823] kcalendarcore: update to 5.85.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {

From 2500fd5c0eb8abd9bb397fd45147d65333caac3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:56 +0200
Subject: [PATCH 699/823] kcmutils: update to 5.85.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 97660c36441c383de50fded0e95315059c2d0cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:58 +0200
Subject: [PATCH 700/823] kcodecs: update to 5.85.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From b2431451836546c2681f63bf3652fdf1df44832d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:59 +0200
Subject: [PATCH 701/823] kcompletion: update to 5.85.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From ef4aa708ad06563e44ed1250e44c6d5b7e16c8f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:00 +0200
Subject: [PATCH 702/823] kconfig: update to 5.85.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build

From 030dd65a558eaf906866e59e9088536d110439df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:02 +0200
Subject: [PATCH 703/823] kconfigwidgets: update to 5.85.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 115a9ee52b940fd666702755ab507229e7f88ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:03 +0200
Subject: [PATCH 704/823] kcontacts: update to 5.85.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 16e8a71ffae10485ca2408d2d7b2188740e2e4f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:05 +0200
Subject: [PATCH 705/823] kcoreaddons: update to 5.85.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8ad48d7ce9efca6c8d955eb404f6289e6634a248 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:06 +0200
Subject: [PATCH 706/823] kcrash: update to 5.85.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 5b09310a680fad7daecb6cd6f5ff5baef7073194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:07 +0200
Subject: [PATCH 707/823] kdav: update to 5.85.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2e1a4b123118a28a51842356ba65f22ffecbb908 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:09 +0200
Subject: [PATCH 708/823] kdbusaddons: update to 5.85.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build

From a6063edcb015d98a9516b6459a93dd7e39725fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:10 +0200
Subject: [PATCH 709/823] kdeclarative: update to 5.85.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build

From b58463cebde137bbaf344593b4dac236d82ea73b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:11 +0200
Subject: [PATCH 710/823] kded: update to 5.85.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 813e5d50e9ab6098d809790c647fef291d1bbcfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:13 +0200
Subject: [PATCH 711/823] kdelibs4support: update to 5.85.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From f26ab38313ff931308950d33a2157f473aa65775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:15 +0200
Subject: [PATCH 712/823] kdesignerplugin: update to 5.85.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 074064cab85ad195ed54fad3365110bb65697fb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:16 +0200
Subject: [PATCH 713/823] kdesu: update to 5.85.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 6723eb7a14f95df08e70c668b952b5293eac4f14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:17 +0200
Subject: [PATCH 714/823] kdewebkit: update to 5.85.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 8dedc37cca62f7ca300900015350fd93a47130c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:19 +0200
Subject: [PATCH 715/823] kdnssd: update to 5.85.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 96804847213c4cdc475d68386eb9f3d56374640b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:20 +0200
Subject: [PATCH 716/823] kdoctools: update to 5.85.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From d89f2ab2b0d207eb6c810ee744ac26c6162c250b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:22 +0200
Subject: [PATCH 717/823] kemoticons: update to 5.85.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c95c937028c6d7f3d3bab11797a647cb6ced7e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:23 +0200
Subject: [PATCH 718/823] kfilemetadata5: update to 5.85.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 091aeb80416fbdc2d1b1e80f06aed9f0f89c63c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:25 +0200
Subject: [PATCH 719/823] kglobalaccel: update to 5.85.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From aafcd6bc146b679535e106d5c5bb1019c11462e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:26 +0200
Subject: [PATCH 720/823] kguiaddons: update to 5.85.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 20fa2641f624e1ab60de830874a0c74d7d3571d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:27 +0200
Subject: [PATCH 721/823] kholidays: update to 5.85.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 7b73c43f3b4b56bbc28354f7e4188d7e0f1204ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:29 +0200
Subject: [PATCH 722/823] khtml: update to 5.85.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 384d745162219a27ff6e001ea053a0897d4786f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:31 +0200
Subject: [PATCH 723/823] ki18n: update to 5.85.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 27c2a331f8d6a3f30913a40ea5143374521a9b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:32 +0200
Subject: [PATCH 724/823] kiconthemes: update to 5.85.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 2f4e82c1a70b0aabb5ba6d0474c9f6e4498118dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:33 +0200
Subject: [PATCH 725/823] kidletime: update to 5.85.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 39482710f0967436af2ed135eca26d0da46843c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:35 +0200
Subject: [PATCH 726/823] kimageformats: update to 5.85.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799

From a123ee2023f204bcf2ba4ad1f316127607d3e63d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:36 +0200
Subject: [PATCH 727/823] kinit: update to 5.85.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"

From efd50809ce5066ae67f4ba5a340a745271230bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:38 +0200
Subject: [PATCH 728/823] kio: update to 5.85.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build

From a0300ad364943a3e77c8e96161763eca2ff446ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:39 +0200
Subject: [PATCH 729/823] kirigami2: update to 5.85.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 6322622b6a74dd5cf88a9fda7341d9e284124826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:41 +0200
Subject: [PATCH 730/823] kitemmodels: update to 5.85.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From a5221ce5675ca10bebafebffb7092ab10de05028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:42 +0200
Subject: [PATCH 731/823] kitemviews: update to 5.85.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From d8246fff44a617073bf2ab61f80a47aa4d8265cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:43 +0200
Subject: [PATCH 732/823] kjobwidgets: update to 5.85.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 30f55c806e4da935760e6a9d943691e183a4f270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:45 +0200
Subject: [PATCH 733/823] kjs: update to 5.85.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0663e68594a81f244916681ae8ed76c9d1f80723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:46 +0200
Subject: [PATCH 734/823] kjsembed: update to 5.85.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 4ad01687182714a8f34045e93b8ea522138e538e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:47 +0200
Subject: [PATCH 735/823] kmediaplayer: update to 5.85.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 37569ee6b90c3438a5b8c1288e9f58e6da4e77ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:49 +0200
Subject: [PATCH 736/823] knewstuff: update to 5.85.0.

---
 srcpkgs/knewstuff/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 156fa1a0102b..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,7 +1,7 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
-revision=2
+version=5.85.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 6c40532fd219842003359715b5e85ac2d820ac7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:50 +0200
Subject: [PATCH 737/823] knotifications: update to 5.85.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 10f686745a94f133589ba0b6fd39baa5a425449d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:52 +0200
Subject: [PATCH 738/823] knotifyconfig: update to 5.85.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 11f08dcda0bd53767f4429f20f565874fbb40491 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:53 +0200
Subject: [PATCH 739/823] kpackage: update to 5.85.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 83081a01acf88dcce7ceab0227e74e621dac39bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:54 +0200
Subject: [PATCH 740/823] kparts: update to 5.85.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!

From 16c4f342f6ce383a9a90345908ad7fe2a3602022 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:56 +0200
Subject: [PATCH 741/823] kpeople: update to 5.85.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build

From 9db8d17397c905944b2152a52689a1327df127c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:57 +0200
Subject: [PATCH 742/823] kplotting: update to 5.85.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e2835761669d71ef968242d49d53531d9ca665e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:58 +0200
Subject: [PATCH 743/823] kpty: update to 5.85.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 83ad5b256a11ce26d15b93a13da782fe8ca7f137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:00 +0200
Subject: [PATCH 744/823] kquickcharts: update to 5.85.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build

From a8f17ad4b7c529da8a75a53378872a2867cb5a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:01 +0200
Subject: [PATCH 745/823] kross: update to 5.85.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From db90af54f37dc4434da4b35f3b9b308ac372206e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:02 +0200
Subject: [PATCH 746/823] krunner: update to 5.85.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build

From 17735616321966ba538f764c9f9e965d79e36e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:03 +0200
Subject: [PATCH 747/823] kservice: update to 5.85.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 30857293f5527afe39f9490d3171497746d7f7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:05 +0200
Subject: [PATCH 748/823] ksolid: update to 5.85.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 50e1d866b0962a19cae13349f7d13b72219709ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:07 +0200
Subject: [PATCH 749/823] ktexteditor: update to 5.85.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build

From 8e825ae021e09753b5ac54f1dbd7b963fec6708d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:08 +0200
Subject: [PATCH 750/823] ktextwidgets: update to 5.85.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 50429eef0037466f1ad806a85b05669ac389bccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:10 +0200
Subject: [PATCH 751/823] kunitconversion: update to 5.85.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 11494033e7820539ef168e0be9e8b42cf4ac6439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:11 +0200
Subject: [PATCH 752/823] kwallet: update to 5.85.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 96d851e1d3a418e69a482db8b56b3620b7d25332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:13 +0200
Subject: [PATCH 753/823] kwayland: update to 5.85.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5b8613a8535c44de54097b494132890759f480e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:14 +0200
Subject: [PATCH 754/823] kwidgetsaddons: update to 5.85.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build

From 76f168943e19230ffd6d40404fbe1b9011d7af7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:16 +0200
Subject: [PATCH 755/823] kwindowsystem: update to 5.85.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 011a64dc3e104ca6c147934fc6adc82d9dc616fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:17 +0200
Subject: [PATCH 756/823] kxmlgui: update to 5.85.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build

From 74c6b7f14952dddcd702685aa22619d9c15ac26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:18 +0200
Subject: [PATCH 757/823] kxmlrpcclient: update to 5.85.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d311e117910bfe9faf5416a41d7b9314bfbad1ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:20 +0200
Subject: [PATCH 758/823] modemmanager-qt5: update to 5.85.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build

From 5fa89a37b3e714cecc3edd432e530bff81bd4fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:22 +0200
Subject: [PATCH 759/823] networkmanager-qt5: update to 5.85.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build

From 8279cae0cc1f3ed628ba50af7ea840a57cae35b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:56 +0200
Subject: [PATCH 760/823] oxygen-icons5: update to 5.85.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 98053b36a5d72f02b663a4aaa423ffd2d4a299b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:58 +0200
Subject: [PATCH 761/823] plasma-framework: update to 5.85.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build

From c915834b2b43b7546f9ac3e84d45211611eb3844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:59 +0200
Subject: [PATCH 762/823] prison: update to 5.85.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 668d46804d7a68c752b25f92d5188ceec986a951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:01 +0200
Subject: [PATCH 763/823] purpose: update to 5.85.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build

From c64ea90cfb70af59986f09c4d2c3a1ecaf97cca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:02 +0200
Subject: [PATCH 764/823] qqc2-desktop-style: update to 5.85.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e5ed77074972bf1556556b829ed68a5b1d4dd1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:03 +0200
Subject: [PATCH 765/823] sonnet: update to 5.85.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From d630a834a6a19ece25d163a6fec0b0cb679beea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:05 +0200
Subject: [PATCH 766/823] syndication: update to 5.85.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"

From edd8544fc278b46be1d94ad52fba6557b772f101 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:07 +0200
Subject: [PATCH 767/823] syntax-highlighting: update to 5.85.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 52f74120e733b02efc21a04d2f89d35582c7f0f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:08 +0200
Subject: [PATCH 768/823] threadweaver: update to 5.85.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 06d6876c9d45bae74a2b6e68143cf3d8c5b7dfd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:38:43 +0200
Subject: [PATCH 769/823] libspa-ffmpeg: remove package

this plugin is useless right now, so removing it to break a cycle
SDL2 -> pipewire -> ffmpeg -> SDL2
---
 srcpkgs/libspa-ffmpeg     |  1 -
 srcpkgs/pipewire/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libspa-ffmpeg

diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {

From f96e390b5b527a5c3b7fb6b18fa41d396a84bf32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:39:04 +0200
Subject: [PATCH 770/823] removed-packages: add libspa-ffmpeg and revbump

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 292ffc7ea954..2bba802eef79 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=48
+revision=49
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -324,6 +324,7 @@ replaces="
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
  nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From b2c141998e8bb89f0f9e291881e1df3f8acc9d7f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 15 Aug 2021 18:47:02 +0300
Subject: [PATCH 771/823] wob: update to 0.12.

---
 srcpkgs/wob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE

From ff7b407a82718d434950e44708f35404ec74ac75 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Tue, 17 Aug 2021 13:27:35 +0300
Subject: [PATCH 772/823] i3status-rust: update to 0.20.3.

---
 srcpkgs/i3status-rust/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 30d649d891b4e6930f0fdccb737c524690ab56f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:10 +0700
Subject: [PATCH 773/823] perl-CGI: depends on perl-HTML-Parser

Even Debian has this mandatory dependencies
---
 srcpkgs/perl-CGI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From bf88ea392c9a968169eaab53653736b86cf7033e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:11 +0700
Subject: [PATCH 774/823] git: update to 2.33.0.

---
 srcpkgs/git/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 26daa34f23b07cab2e206c6c2e8792fef2a721e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:13 +0700
Subject: [PATCH 775/823] chroot-git: update to 2.33.0.

---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..2bdb4d76bee0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,20 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	checkdepends="perl gnupg"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
@@ -28,7 +27,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +37,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -52,6 +53,10 @@ do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }

From 09c9a277314b7a9b0fa14dbd4c5489c4e1222f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 21:28:05 +0700
Subject: [PATCH 776/823] chroot-git: use masterdir's zlib-devel in bootstrap

---
 srcpkgs/chroot-git/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 2bdb4d76bee0..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -14,8 +14,6 @@ checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -47,6 +45,9 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {

From c6e810ddb257dc6f23e81c00a935beb31bca7d49 Mon Sep 17 00:00:00 2001
From: auronandace <81362994+auronandace@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:54:22 +0100
Subject: [PATCH 777/823] alacritty: update to 0.9.0

---
 srcpkgs/alacritty/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 1493be14f28c79e90fb222e0206b38dc0eb4540c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 15:46:15 +0200
Subject: [PATCH 778/823] perl-IO-Socket-SSL: update to 2.072.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d

From f72397c8c87688f45f27333190ba881c8cd68465 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 19:15:01 +0200
Subject: [PATCH 779/823] libx86: fix illegal instruction in LRMI_init.

E.g. triggered by read-edid.
Change upstream to debian source.
Adopt.
---
 srcpkgs/libx86/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}

From 8467dd905d2f784b4de7259c608a8c2375b7d996 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:40:27 +0200
Subject: [PATCH 780/823] linux5.4: update to 5.4.141.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9316ea45e0a8..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.140
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From cc351820d2fc87850d622e155cfbacf5e2103c35 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:37:02 +0700
Subject: [PATCH 781/823] ktuberling: update to 21.08.0

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297

From d96db658c08314db71d39604eeb8515b639e67a9 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:32:46 +0700
Subject: [PATCH 782/823] krfb: update to 21.08.0

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592

From 861a06b86d5f3389a778dd8760c377ea7cf45447 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:42:19 +0200
Subject: [PATCH 783/823] linux4.19: update to 4.19.204.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 914f8f45b75f..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.203
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From e3acb7dab578180bda9cdd6b8a2ce891faaf73fa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 20:00:21 +0200
Subject: [PATCH 784/823] smplayer: update to 21.8.0.

---
 srcpkgs/smplayer/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {

From 85788cebabfb520064ffd2bb5ef894e796cdaed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 17:56:19 +0200
Subject: [PATCH 785/823] xbps-src: source msg_warn before its first use

---
 xbps-src | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..5e75926c5ad5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -689,12 +689,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +696,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 106b97096f88a0d97e9528d55e6bd510c86126c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 18:58:39 +0200
Subject: [PATCH 786/823] xbps-src: limit warning on file:/// mirror to related
 targets

---
 xbps-src | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 5e75926c5ad5..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }

From 6fad3941d4d46322eeaabd6d1d02bc1002fcbc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:30 +0200
Subject: [PATCH 787/823] diffoscope: update to 180.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e

From 52c52d339096431b3f82c03f6a2ce00c0837b4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:31 +0200
Subject: [PATCH 788/823] hunspell-pl_PL: update to 20210731.

---
 srcpkgs/hunspell-pl_PL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip

From 8942d2f87099d27784a09b841e2957a8d9ada190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:32 +0200
Subject: [PATCH 789/823] python3-libarchive-c: update to 3.1.

---
 srcpkgs/python3-libarchive-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103

From f191db1d9cdfde83d6dba481c9726d7a995ab016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:33 +0200
Subject: [PATCH 790/823] python3-pysol_cards: update to 0.10.2.

---
 srcpkgs/python3-pysol_cards/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE

From e6a84dc43c3e193f3646bce3000ae8c41ba39a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:34 +0200
Subject: [PATCH 791/823] tox: update to 3.24.1.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 2b65cf79d475eaf53a3bc75d4f8fe1bce7f3d028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:50:44 +0200
Subject: [PATCH 792/823] konversation: update to 21.08.0.

---
 srcpkgs/konversation/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi

From 88b2e95d7619d7296352a71bb026f3ff934b9246 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:00:52 +0700
Subject: [PATCH 793/823] gnome-desktop: update to 40.3

---
 srcpkgs/gnome-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"

From 7a6acd873d5d2c27dc975ceac5196d075386f778 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:34:23 +0700
Subject: [PATCH 794/823] gnome-shell: update to 40.3

---
 srcpkgs/gnome-shell/template | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }

From c638ca21e450284db0777605fa8c13faa1e7da57 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 03:39:28 +0700
Subject: [PATCH 795/823] gnome-shell-extensions: update to 40.3

---
 srcpkgs/gnome-shell-extensions/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b

From 0ab4c8bdad466fa14db4a2676c35639e3ce77799 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:18:12 +0200
Subject: [PATCH 796/823] gnome-shell-mousewheel-zoom: remove package

* inactive
* doesn't work with current GNOME
---
 srcpkgs/gnome-shell-mousewheel-zoom/template | 23 --------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template

diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}

From 4d4179442f372b361655bbb9749c5426b03cd987 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:19:25 +0200
Subject: [PATCH 797/823] removed-packages: add gnome-shell-mousewheel-zoom

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2bba802eef79..3565931e6fa4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6

From 92bb9bd99f9d46d5819230044574c55708adf036 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:51:05 +0200
Subject: [PATCH 798/823] img2pdf: disable tests

tests need ImageMagick6
---
 srcpkgs/img2pdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6

From 41e875032cdb3707596cb8b965b89f493dc96356 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:52:41 +0200
Subject: [PATCH 799/823] ImageMagick6: remove package

---
 srcpkgs/ImageMagick6/template | 86 -----------------------------------
 srcpkgs/ImageMagick6/update   |  1 -
 srcpkgs/libmagick6            |  1 -
 srcpkgs/libmagick6-devel      |  1 -
 srcpkgs/libmagick6-perl       |  1 -
 5 files changed, 90 deletions(-)
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 213d98a37659..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file

From cf2db54eaec8ad87e17d354bc3b6332995155ac8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:53:22 +0200
Subject: [PATCH 800/823] removed-packages: add ImageMagick6 and revbump

---
 srcpkgs/removed-packages/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3565931e6fa4..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=49
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -182,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 34076e87e24b954c87ed64f392692b096b0568f0 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 17 Aug 2021 19:05:44 -0400
Subject: [PATCH 801/823] ejabberd: update to 21.07.

---
 srcpkgs/ejabberd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"

From 713f647d89fa4d0ff9e2cff95853c59c5a44d2a6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:04:01 -0400
Subject: [PATCH 802/823] mongo-c-driver: update to 1.19.0.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From d7c095db6829659864e770dbc4710f388ecc32ac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:10:49 -0400
Subject: [PATCH 803/823] pcsclite: update to 1.9.3.

---
 srcpkgs/pcsclite/patches/python3.patch | 12 +++---------
 srcpkgs/pcsclite/template              |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd

From dc2b89ab40fb0654975fe16c1bc4d80d3d3f70e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:17:43 -0400
Subject: [PATCH 804/823] oidentd: update to 3.0.0.

---
 srcpkgs/oidentd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd

From c0d765f99dafcece0ac674f5fba702b61ebe8c00 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:19:02 -0400
Subject: [PATCH 805/823] sqlmap: update to 1.5.8.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {

From da71c8b8f4c3922c14294fa177680cffa6ccee50 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:30:25 -0400
Subject: [PATCH 806/823] libnsl: update to 2.0.0.

---
 common/shlibs           | 2 +-
 srcpkgs/libnsl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index befa6484dfee..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3658,7 +3658,7 @@ libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
 libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi

From 9b2bb5ae2c2f1f6bc05918d726b2897685456149 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:25:57 -0400
Subject: [PATCH 807/823] log4cpp: bump for libnsl

---
 srcpkgs/log4cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"

From 8ad2ca7965e1135e103d4a258fb7197f3da8e244 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 17 Aug 2021 10:18:54 -0500
Subject: [PATCH 808/823] kitty: update to 0.23.1.

Closes: #32541 [via git-merge-pr]
---
 srcpkgs/kitty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From eeb785239f5601a4340099f9cccc617bce96656c Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:48:09 +0200
Subject: [PATCH 809/823] fuzzel: update to 1.6.2.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 76d7618695262cc23d9ba8fcaa8431608b2867bb Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:50:37 +0200
Subject: [PATCH 810/823] fcft: update to 2.4.5.

---
 srcpkgs/fcft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 678d3823497b8d015d91254beefd45ba6db20494 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH 811/823] dbeaver: update to 21.1.5.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.4
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {

From 7c4b90200da0639a4923cab9033ff9b056a0c5ae Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 13 Aug 2021 13:38:02 -0500
Subject: [PATCH 812/823] mesa: update to 21.1.7.

---
 srcpkgs/mesa/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 68d6a112681e..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.6
-revision=2
-wrksrc="mesa-${version}"
+version=21.1.7
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From f9fa2f9c9a8d8e3e1a9894bf79d3eccc18d39ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 17 Aug 2021 16:56:25 -0300
Subject: [PATCH 813/823] haproxy: update to 2.4.3.

Move to using DEBUG_CFLAGS when passing CFLAGS to makefile, otherwise we
override their required CFLAGS, such as -fwrapv.
---
 srcpkgs/haproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index c155186f100d..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
-revision=2
+version=2.4.3
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"

From 31232ddded030da3d9b826b549f69f93805e057a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:54:42 -0400
Subject: [PATCH 814/823] grpc: update to 1.39.1.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then

From cf20825bcef7ed44b0d43dd47ee4475fd06b060e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:55:19 -0400
Subject: [PATCH 815/823] python3-Pygments: update to 2.10.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From d1dbca1781b1d37869ca22f711964c8df4089027 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:56:50 -0400
Subject: [PATCH 816/823] python3-numpy: update to 1.21.2.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From b233ae640477ca07746b4a2da1e7199f1705bd04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 21:11:07 -0400
Subject: [PATCH 817/823] python3-pandas: update to 1.3.2.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 2bb0ec3cadba28ebb1db5e8ca2ebb689614afa62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:07:59 -0400
Subject: [PATCH 818/823] python3-pip: update to 21.2.4.

---
 .../python3-pip/patches/no-versioned-pip.patch | 18 +++++++++---------
 srcpkgs/python3-pip/template                   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index b07a3022fe14..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,12 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
 @@ -67,9 +67,7 @@
-     },
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 225ede1ccd09..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.3
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 

From 1fc7f2202ba57a1a1b052c8356f874c19cb158f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:24 -0400
Subject: [PATCH 819/823] python3-pytools: update to 2021.2.8.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE

From 2d075e8ae6b138c55dd95ff467b8bc3382b3a6f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:43 -0400
Subject: [PATCH 820/823] python3-ultrajson: update to 4.1.0.

---
 srcpkgs/python3-ultrajson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt

From 42eb9816c485382bb5ecb04400c0005ee185d80d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:25 -0400
Subject: [PATCH 821/823] qtutilities: update to 6.5.0.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 7fbe9e1b321b450374390d2fa41c708ee83c6007 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:39 -0400
Subject: [PATCH 822/823] tagparser: update to 10.1.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From a7db6e87006afbff2101e6be212d518a1fe59ebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:13:20 -0400
Subject: [PATCH 823/823] tageditor: update to 3.4.3.

libcgroup update version 2.o

checksum bz2 corrected

Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.

update to 2.0
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 .../libcgroup/patches/CVE-2018-14348.patch    |  12 +
 .../patches/api.c-fix-infinite-loop.patch     |  38 +
 srcpkgs/libcgroup/patches/musl-decls.patch    |   3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |   4 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 864 files changed, 4643 insertions(+), 5999 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..a1e7d86258cc 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,25 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
+<<<<<<< HEAD
 license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+=======
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+>>>>>>> 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +28,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index fbbbbe79bd3b..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.2
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 3221983 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 001/824] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From bf8ebed919a49d5fd815cc29d6de60b84e435283 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 27 Jul 2021 23:48:35 +0200
Subject: [PATCH 002/824] harfbuzz: update to 2.8.2.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..106a44ff3139 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From d1dc4cc5affe165ab385a92277e491ce3028f0ea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:52:23 +0200
Subject: [PATCH 003/824] openfortivpn: update to 1.17.0.

---
 srcpkgs/openfortivpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 

From 830b5cf6024b9c44811ae3b045f538501cf2036c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:54:25 +0200
Subject: [PATCH 004/824] openradtool: update to 0.13.8.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 14cf67008c2cf670ae69a87e6e0bd07375aa52c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:30:18 -0500
Subject: [PATCH 005/824] libxlsxwriter: update to 1.1.0.

---
 common/shlibs                  | 2 +-
 srcpkgs/libxlsxwriter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..04eefcdcbdd1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 35bc0ff0173134851df64250bcabdecdcb124282 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:29:52 -0500
Subject: [PATCH 006/824] sc-im: revbump for libxlsxwriter

---
 srcpkgs/sc-im/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 648a81d0aae80af6f2b348567be5386bdc2d9519 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 16:27:33 -0500
Subject: [PATCH 007/824] plantuml: update to 1.2021.9.

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh

From a7e520652eca96541cd717a1ec605648a18df24d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 28 Jul 2021 09:31:18 +0200
Subject: [PATCH 008/824] slack-desktop: update to 4.18.0

Closes: #32225 [via git-merge-pr]
---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes

From 24be999842fbe6eb37d10416728c57faf5df46c7 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Wed, 28 Jul 2021 18:31:25 +0700
Subject: [PATCH 009/824] flameshot: update to 0.10.1

---
 srcpkgs/flameshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9

From 75915800ba3c8a76fc0edb5824d3127883475cf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:44:58 +0200
Subject: [PATCH 010/824] bcc: update to 0.21.0.

---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..5fdf8be098b3 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"

From d0312f1bc0a7f8e60649f3ed3a86dbf60a390f05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:45:58 +0200
Subject: [PATCH 011/824] ipset: update to 7.14.

---
 srcpkgs/ipset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..51150121385d 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.14
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
 
 libipset_package() {
 	short_desc+=" - library files"

From c7ae4c23cc372799cd43739c9a08b907900bb360 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:47:29 +0200
Subject: [PATCH 012/824] nncp: update to 7.5.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..279d6235b763 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.5.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
 
 do_build() {
 	make

From 8f8fcf82af1b641a570d0e41f41bdb51223f6259 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:50:24 +0200
Subject: [PATCH 013/824] perl-PDF-API2: update to 2.041.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..6c50c810c944 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module

From ff36084ae0956c2b89926e9ccab1cf4cb5713ada Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:25 +0200
Subject: [PATCH 014/824] opam: update to 2.1.0.

---
 srcpkgs/opam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 

From 4fa72959cafa46001b94b3be85499d789b098bfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:50 +0200
Subject: [PATCH 015/824] linux5.10: update to 5.10.54.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..2832c9d04add 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.54
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c6bd940d033d86a20dc645a956b4a77dc9173b9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 15:11:02 +0200
Subject: [PATCH 016/824] perl-PDF-API2: fix checksum.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 6c50c810c944..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537

From 0f2a4868ac92d8aa4482d989434fbea8d50bbc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 10:15:44 -0300
Subject: [PATCH 017/824] mdBook: update to 0.4.11.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..49e3264c70be 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.11
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
 
 post_install() {
 	vlicense LICENSE

From 5ae6df447f0f4723ee952c49f13bbbc1f79d4201 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 29 Jul 2021 18:33:03 +0200
Subject: [PATCH 018/824] LuaJIT: switch ppc patches to -p1 (fixes texlive
 build)

---
 .../patches/ppc/musl-ppc-secureplt.patch      | 12 ++---
 .../patches/ppc64/add-ppc64-support.patch     | 48 +++++++++----------
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |  4 +-
 srcpkgs/LuaJIT/template                       |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 

From 251975e3edaa84ca8014edf4a3b3dcae0f0d8502 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 28 Jul 2021 18:30:08 +0200
Subject: [PATCH 019/824] cozy: update to 1.0.4.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..b198300da9a4 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2

From b64df7fa72e80229b80380a6baf53461cb4cc2bc Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 28 Jul 2021 22:26:57 -0500
Subject: [PATCH 020/824] mesa: update to 21.1.6.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..8664f4d799bc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.6
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 584935583d52e61a311c4011af754a0c058b5b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 08:28:17 +0200
Subject: [PATCH 021/824] postfix: update to 3.6.2.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..4dc1b9e5dad8 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
+version=3.6.2
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 2beff1801b36b5e34dbe54c3ee82623aeb79b0c2 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <dominic@dominic.io>
Date: Thu, 29 Jul 2021 10:17:20 +0100
Subject: [PATCH 022/824] clojure: update to 1.10.3.933.

---
 srcpkgs/clojure/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure

From ea798d1d800dcef686b456aa43d6bbb9ad9b9da2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:13:46 +0200
Subject: [PATCH 023/824] linux5.4: update to 5.4.136.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..4fd63332b5c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.136
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From de666e86ddf53c919cc017561be7ece833d0de45 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:20:36 +0200
Subject: [PATCH 024/824] linux4.19: update to 4.19.199.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..a6e4f5a686b2 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.199
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4a99bde93b38c191d33fff12dd66485fb6cb7ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 16:00:15 -0300
Subject: [PATCH 025/824] yambar: fix launching with --backend=wayland.

Fixes: #32248.
---
 .../yambar/patches/0001-bar-fix-typo.patch    | 27 +++++++++++++++++++
 srcpkgs/yambar/template                       |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"

From d0113f34e8ec82bfd748c95c7c66d97be6bc542e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:07:32 +0200
Subject: [PATCH 026/824] isync: update to 1.4.3.

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From cd10a1791ec25645b7493324b05342feb334a3c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:09:51 +0200
Subject: [PATCH 027/824] xorg-server: update to 1.20.13.

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From c74c393167b226b8d5bbabb7cca7645ca8d247b8 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 30 Jul 2021 07:02:48 +0200
Subject: [PATCH 028/824] python3-pikepdf: update to 2.16.1.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From e3e508821f2bb1497d37e5f383475878c506c26e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:55:08 +0300
Subject: [PATCH 029/824] sublime-merge-bin: update to 2059.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 5641313fd32510cc7f521eb3aa78092249527b08 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:39:19 +0300
Subject: [PATCH 030/824] notcurses: update to 2.3.12.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..4b3563f65ffc 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.12
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 4876e6e11574697733cf09433c8c4c5e22c7158b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:28:22 +0300
Subject: [PATCH 031/824] skype: update to 8.74.0.152.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..d8e2f3a77606 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.74.0.152
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
 repository="nonfree"
 nostrip="yes"
 

From cf155a52e7e16d38b5a9f335fc9c6fa880c90459 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jul 2021 08:35:40 +0200
Subject: [PATCH 032/824] pp: update to 1.0.9.

---
 srcpkgs/pp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2dd28af4c82f5d7b459f388636dfde6c3b3cc820 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 27 Jul 2021 12:12:28 -0700
Subject: [PATCH 033/824] OpenRCT2: update to 0.3.4.1

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..761da7f1e580 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
+version=0.3.4.1
 revision=1
 build_style=cmake
 configure_args="
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"

From 0aed85bdb32a1c29c8c5bd33f91b431620ae2486 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 21:05:15 +0300
Subject: [PATCH 034/824] mbedtls: update to 2.16.11.

---
 srcpkgs/mbedtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C

From 2c7ebe686e6539d65d3e64b4eb0c16b5e3544911 Mon Sep 17 00:00:00 2001
From: boson-at <boson@gmx.at>
Date: Fri, 30 Jul 2021 06:16:56 +0200
Subject: [PATCH 035/824] osm2pgsql: update to 1.5.1.

---
 srcpkgs/osm2pgsql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e

From 894908b71b0342b1d3fa3709a0010cd5a2130a81 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 036/824] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From f0478f19b9c72c29ef01de96496177a9d2bc95b7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 037/824] plasma-workspace: revbump for libqalculate.so.22

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel

From 4aedc78b57437bccebfb2655ad2da8538168ad92 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 038/824] qalculate-gtk: update to 3.20.1

---
 srcpkgs/qalculate-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..f71c085f5e8a 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 730d52125fc8942128d1e15c5cd72bc97eccb141 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 039/824] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

From b83d25247b20e2063d28c05516882c1dea443938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Jul 2021 17:06:48 -0300
Subject: [PATCH 040/824] util-linux: backport fix for su(1).

Since trusting PAM_RUSER is left to administrators, make sure it can be
trusted if necessary.
---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..41bffc545884 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 7bccf7fad7e63a457812157856c53e95bf5c606c Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 30 Jul 2021 17:41:13 -0600
Subject: [PATCH 041/824] mu: update to 1.6.1

---
 srcpkgs/mu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 6e5e816b5ca9..36d67ef65cba 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,16 +1,16 @@
 # Template file for 'mu'
 pkgname=mu
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
 
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" emacs"

From 00a8dd3e694f8b884b0a1c132f441765228d19fa Mon Sep 17 00:00:00 2001
From: jailbird777 <jailbird@fdf.net>
Date: Mon, 26 Jul 2021 19:11:45 -0500
Subject: [PATCH 042/824] New package: dnsdist-1.6.0

---
 srcpkgs/dnsdist/files/dnsdist/run |  4 ++++
 srcpkgs/dnsdist/template          | 36 +++++++++++++++++++++++++++++++
 srcpkgs/dnsdist/update            |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update

diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"

From 2e448c405e2cce6c4a8089cca243d791df0d6b49 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 27 Jul 2021 11:36:40 +0200
Subject: [PATCH 043/824] libX11: patch for new symbols

Apply upstream merge request to handle the new _EVDEVK xorgproto symbols,
so that xkbcomp does not generate hundreds of warnings.
See https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79
---
 .../handle_new_xorgproto_symbols.patch        | 42 +++++++++++++++++++
 srcpkgs/libX11/template                       |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch

diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From 476583c474bc04e927239615104130bb6fcb3a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 23 Jul 2021 12:24:43 +0000
Subject: [PATCH 044/824] dnscrypt-proxy: fix logging (redirect stderr to
 svlogd).

---
 srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run | 1 +
 srcpkgs/dnscrypt-proxy/template                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"

From 53c7116b9a63e71269449b66415807de0ed0f6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gerdau?= <bjoerngerdau@gmx.de>
Date: Wed, 21 Jul 2021 22:21:23 +0200
Subject: [PATCH 045/824] kubernetes: update to 1.21.3.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..08d2f27b3859 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 805cb4f9eb1b8ba71c64c38ef85d8ac43d99cf4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 31 Jul 2021 12:05:35 +0700
Subject: [PATCH 046/824] cryfs: build with NDEBUG defined

Close: #32266
---
 srcpkgs/cryfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..6d8f855a80af 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel

From 58c88407e18253ac9d27fe208e1dc6843ca59b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Wed, 28 Jul 2021 22:15:51 +0000
Subject: [PATCH 047/824] tailscale: update to 1.12.1.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE

From 1031b03e01d8e1b82244b88cbd317895651c2c3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jul 2021 16:56:57 +0200
Subject: [PATCH 048/824] knot-resolver: update to 5.4.0.

---
 srcpkgs/knot-resolver/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..b07a400a3a02 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
+version=5.4.0
 revision=1
 build_style=meson
 configure_args="
@@ -8,17 +8,18 @@ configure_args="
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From f9e2bddbcb5f3cc2ad3366c55ae9017e8b6854a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 31 Jul 2021 14:31:05 +0200
Subject: [PATCH 049/824] monit: update to 5.28.1.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap

From 26708d26b89093c61ec10887f0c38382fcf16ddd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 31 Jul 2021 16:49:34 -0500
Subject: [PATCH 050/824] hivex: update to 1.3.20.

---
 srcpkgs/hivex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..1ed578d92e17 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.20
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
 nocross=yes

From 1f2aa9d964d19080e49d9a4a4ca41e91269fb554 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 31 Jul 2021 22:40:39 +0200
Subject: [PATCH 051/824] webkit2gtk: add more BE fixes

---
 .../patches/be-imagebufferbackend.patch       | 214 ++++++++++++++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++++
 2 files changed, 262 insertions(+)
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2

From fe9051867433b91e17128ac090c3f6fa8cb642aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:57 +0200
Subject: [PATCH 052/824] bluedevil: update to 5.22.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 4182e1a5ba8b0c7219cb689e7ff2e240efc14f04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:59 +0200
Subject: [PATCH 053/824] breeze-gtk: update to 5.22.4.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 297a08aceddc5530b360214508f304572c515c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:06 +0200
Subject: [PATCH 054/824] breeze: update to 5.22.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 065852826ab37f6dc77c4459158ad107978be922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:07 +0200
Subject: [PATCH 055/824] kactivitymanagerd: update to 5.22.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce

From 1810152e1f56df634ec6ae3d7e0febe0c9d5bad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:09 +0200
Subject: [PATCH 056/824] kde-cli-tools: update to 5.22.4.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 820bddb8cc52202608785b2db5aabdd0f930d862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:10 +0200
Subject: [PATCH 057/824] kde-gtk-config5: update to 5.22.4.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c18bf9893294ea60ca77fd5f8091a254873fd1d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:12 +0200
Subject: [PATCH 058/824] kdecoration: update to 5.22.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 0a88170a2ae49b69e48816588f695e6dd2820336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:13 +0200
Subject: [PATCH 059/824] kdeplasma-addons5: update to 5.22.4.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2b7dd6ecc4075a5601f02cc9c4a89e87a50f782b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:14 +0200
Subject: [PATCH 060/824] kgamma5: update to 5.22.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From e17b6f51d05bb5c53761e6fdd7ef65297d51d172 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:16 +0200
Subject: [PATCH 061/824] khotkeys: update to 5.22.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 3e67029160dfb48ed668c2e1601783bf89816da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:18 +0200
Subject: [PATCH 062/824] kinfocenter: update to 5.22.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 32235fde4742bf035d801c9746f69e0209552901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:19 +0200
Subject: [PATCH 063/824] kmenuedit: update to 5.22.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0

From 79997e03280ecf8d42125336f8a84daf9dc5f43a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:21 +0200
Subject: [PATCH 064/824] kscreen: update to 5.22.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f6294bce6eb9994211ce9e182650009f9aa11342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:22 +0200
Subject: [PATCH 065/824] kscreenlocker: update to 5.22.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 18e1026487399c3a7a2ce79ebd323fa7e9dff88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:24 +0200
Subject: [PATCH 066/824] ksshaskpass: update to 5.22.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 6fc37d84520d82cfe038da0104f5bf686f0dd5cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:25 +0200
Subject: [PATCH 067/824] ksystemstats: update to 5.22.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5

From 5063d1ccd837452ece28451f0576a3e1f5732dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:27 +0200
Subject: [PATCH 068/824] kwallet-pam: update to 5.22.4.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2

From 4420f4e96772b059ca1c048c75a707ecb999faa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:28 +0200
Subject: [PATCH 069/824] kwayland-integration: update to 5.22.4.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e

From 4b5d44cc010f11f556c0d2f986e13840f8e58d92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:29 +0200
Subject: [PATCH 070/824] kwayland-server: update to 5.22.4.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 873c60b97358cc9c08bbdf7e8362b80ad29a3db1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:32 +0200
Subject: [PATCH 071/824] kwin: update to 5.22.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"

From 9730118279df11c3ad8b96453db3aa6c302ce905 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:33 +0200
Subject: [PATCH 072/824] kwrited: update to 5.22.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5

From 55f428cce7515cc770eea2afbd4eb38ab16f5b24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:34 +0200
Subject: [PATCH 073/824] layer-shell-qt: update to 5.22.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 84946bf3d38186226c8b81344d95766f85ba6524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:36 +0200
Subject: [PATCH 074/824] libkscreen: update to 5.22.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 5085c2ec9257a08225b717d1e269ab37869da23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:37 +0200
Subject: [PATCH 075/824] libksysguard: update to 5.22.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 

From 71de4a03f8957eac88eba1c4ae5a951c6d14dca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:39 +0200
Subject: [PATCH 076/824] milou: update to 5.22.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3dcb3abae554c9a06305c53bc35c5385856e3e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:41 +0200
Subject: [PATCH 077/824] oxygen: update to 5.22.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc

From 825dc137b137b77093966e2cbd14c5073dd73cb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:42 +0200
Subject: [PATCH 078/824] plasma-browser-integration: update to 5.22.4.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From ee40aaeb90ea53724c7294666882c40e99722dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:46 +0200
Subject: [PATCH 079/824] plasma-desktop: update to 5.22.4.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3

From 17e9e849ea0e6d943d92397aeb10d3a896950175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:47 +0200
Subject: [PATCH 080/824] plasma-disks: update to 5.22.4.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909

From 521bfe3f92aea3574ca1e0b1a0ffc0c87447dd00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:49 +0200
Subject: [PATCH 081/824] plasma-firewall: update to 5.22.4.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0

From d8dfb12795b9285894034050838d4a72a3ace9ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:50 +0200
Subject: [PATCH 082/824] plasma-integration: update to 5.22.4.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467

From 0f0aaa92d4b504cde54e6fd1bfe958af1effc927 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:52 +0200
Subject: [PATCH 083/824] plasma-nm: update to 5.22.4.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5b7986e96346b51e8d4174a9dfc70257e3d0a6ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:53 +0200
Subject: [PATCH 084/824] plasma-pa: update to 5.22.4.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 700491832bd8de34062a175405b5ffef4f65220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:55 +0200
Subject: [PATCH 085/824] plasma-sdk: update to 5.22.4.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 13fd1f8b3ab81f3a914635556bd5d57fe08d0c9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:56 +0200
Subject: [PATCH 086/824] plasma-systemmonitor: update to 5.22.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be

From 6963498c213b686efecea6ff90f5bf17994a7acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:58 +0200
Subject: [PATCH 087/824] plasma-thunderbolt: update to 5.22.4.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services

From 75173d470aff372c2a12b990fcfa08d7358e7720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:59 +0200
Subject: [PATCH 088/824] plasma-vault: update to 5.22.4.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 1b19a5acce520117cdc1efa3a75860e7fe3e40fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:08 +0200
Subject: [PATCH 089/824] plasma-workspace-wallpapers: update to 5.22.4.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29

From 62e4fe155ea27782c39682c8cdeac0377a343e67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:11 +0200
Subject: [PATCH 090/824] plasma-workspace: update to 5.22.4.

---
 srcpkgs/plasma-workspace/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index fa84666b06fb..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
-revision=2
+version=5.22.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"

From b9bddaf4fc50f89a4abe42162a3d75a9f4353e09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:12 +0200
Subject: [PATCH 091/824] polkit-kde-agent: update to 5.22.4.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f

From 958ad12c4c1086f4c9261f620cbb5701fba03821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:15 +0200
Subject: [PATCH 092/824] powerdevil: update to 5.22.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c

From 355ae4cb66d20393c952b25861521ce849dce34c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:16 +0200
Subject: [PATCH 093/824] sddm-kcm: update to 5.22.4.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022

From 1689a7936293ec4f122162aad2a822be190dedf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:17 +0200
Subject: [PATCH 094/824] systemsettings: update to 5.22.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa

From 759bf77cc98e1609c69ab8930be71ab4a8bd5cfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:19 +0200
Subject: [PATCH 095/824] xdg-desktop-portal-kde: update to 5.22.4.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6

From 578e8752ad5822e14608fd754cb628aa2f8623d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:09 -0400
Subject: [PATCH 096/824] python3-aioredis: update to 2.0.0.

---
 srcpkgs/python3-aioredis/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE

From 87dd6c58f9b89ed34e4dc2a90e39cc711167ff61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:49 -0400
Subject: [PATCH 097/824] python3-flit_core: update to 3.3.0.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE

From 191519639e496b89c0a9632d5b8c738054f61aa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:44:39 -0400
Subject: [PATCH 098/824] python3-pip: update to 21.2.2.

---
 .../patches/no-versioned-pip.patch            | 19 ++++++++++---------
 srcpkgs/python3-pip/template                  |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..b07a3022fe14 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,11 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+@@ -67,9 +67,7 @@
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..3e800139d4da 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.2
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
 # Tests have unpackaged dependencies
 make_check=no
 

From 4ecf8b8a4e5f6791b0d38896c37b426c8c8a8fa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:55:47 -0400
Subject: [PATCH 099/824] python3-tifffile: update to 2021.7.30.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..0e9e467e1564 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.7.30
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
 # Tests require unpackaged fsspec
 make_check=no
 

From 98de8e3b3105dd94ab6c3c2fe071e3503547d031 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 28 Jul 2021 20:04:41 +0300
Subject: [PATCH 100/824] qutebrowser: update to 2.3.1

Closes: #32236 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From 755ebf64fa93f646b9444906272f0b944b3a8713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 1 Aug 2021 03:03:31 +0200
Subject: [PATCH 101/824] kubernetes: fix build

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 08d2f27b3859..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh

From f1352aeba3d93eb58235e06091768ced9dee31d0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:45:54 +0200
Subject: [PATCH 102/824] wine: update to 6.14.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..30be01e169b2 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.14/dlls/dnsapi/libresolv.c
++++ b/wine-6.14/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..bb2fa789c7e7 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.14
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
+ 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 82d9b2bf941dcc859ac3414cb5ceac4768e7f4e9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:47:38 +0200
Subject: [PATCH 103/824] wine-mono: update to 6.3.0.

---
 srcpkgs/wine-mono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 3436c69dd25a5964cdf9b666e9d1a2653b5be4fd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:50:34 +0200
Subject: [PATCH 104/824] linux5.4: update to 5.4.137.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 4fd63332b5c9..807b6b49c848 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.136
+version=5.4.137
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
+checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 846a9d9602b827a11a539dfe9463d80cd019cd80 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:53:39 +0200
Subject: [PATCH 105/824] linux4.19: update to 4.19.200.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a6e4f5a686b2..1962af9c6030 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.199
+version=4.19.200
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
+checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 658962505a222a3e828777a850caddd32900e62c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:46:12 +0200
Subject: [PATCH 106/824] python3-pyinfra: update to 1.4.11.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..b7c5bebb3e56 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.11
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 7b2ab0e7fb9c1022d0ac7c15a0d13dde9ac0cc17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:48:08 +0200
Subject: [PATCH 107/824] sleuthkit: update to 4.11.0.

---
 srcpkgs/sleuthkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

From 63599059d0f13b19b36b3e4805974fc86f7c3d33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:50:43 +0200
Subject: [PATCH 108/824] sbcl: update to 2.1.7.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 6b47f1aff805e83d69d7cd981bd71989db748ede Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 16:59:09 +0200
Subject: [PATCH 109/824] hugo: update to 0.86.1.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..03cdeb450eae 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.86.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
 
 post_install() {
 	vdoc README.md

From 80539eb4856eb564986a59837ab587b18236fc8e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 17:03:26 +0200
Subject: [PATCH 110/824] freeplane: update to 1.9.7.

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 4c15a7022daffc1de7e98bb12ef93d4bfe196f71 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 1 Aug 2021 19:54:29 +0200
Subject: [PATCH 111/824] shfmt: update to 3.3.1.

Closes: #32290 [via git-merge-pr]
---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 8180bbd08443aa4acd6a15c5c6408239afb27112 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:30:05 +0200
Subject: [PATCH 112/824] sfeed: update to 0.9.25.

Closes: #32287 [via git-merge-pr]
---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..9f3d23098319 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
 
 post_install() {
 	vlicense LICENSE

From 7b14cce382cf4eba02064a324ce758999122e407 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 1 Aug 2021 00:44:56 +0300
Subject: [PATCH 113/824] mousepad: update to 0.5.6.

Also:
- replace gtksourceview-devel with gtksourceview4-devel in makedepends.

Closes: #32277 [via git-merge-pr]
---
 srcpkgs/mousepad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f

From 01f6ee69649b02cfe46f5d7850d3f3a8d9b62e80 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 31 Jul 2021 19:23:50 +0200
Subject: [PATCH 114/824] s: update to 0.5.16.

Closes: #32271 [via git-merge-pr]
---
 srcpkgs/s/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE

From 0af2b4c515fbd6e58113fadf2f0c6091f569416b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:50:40 +0300
Subject: [PATCH 115/824] python3-distro: update to 1.6.0.

Also:
- add checkdepends to enable tests.

Closes: #32260 [via git-merge-pr]
---
 srcpkgs/python3-distro/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424

From dc8f929dfbc90fd31717cc1df8be050610a9b99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 18:06:38 +0200
Subject: [PATCH 116/824] tickr: update to 0.7.1.

Closes: #32247 [via git-merge-pr]
---
 srcpkgs/tickr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;

From 70d8435c0f0c224e1dc9ba096cd928faf0dc51e8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:47:34 +0200
Subject: [PATCH 117/824] python3-pyrsistent: update to 0.18

---
 srcpkgs/python3-pyrsistent/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {

From 7ba6e9a9a3934f9cb326e7c7060693c2f6cbb422 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:50:00 +0200
Subject: [PATCH 118/824] python3-jupyterlab_server: update to 2.6.1

---
 srcpkgs/python3-jupyterlab_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 

From 30aa5752c8009815df56229c6523a3d59fbf99b0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:51:27 +0200
Subject: [PATCH 119/824] python3-jupyter_server: update to 1.10.1

---
 srcpkgs/python3-jupyter_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 

From 4d9261d3aa412f7f31e5f61ecb288d1304ff3be7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:52:59 +0200
Subject: [PATCH 120/824] python3-json5: update to 0.9.6

---
 srcpkgs/python3-json5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c

From 05d3902453902619fb1bc887e99df60858368a95 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:54:15 +0200
Subject: [PATCH 121/824] python3-anyio: update to 3.3.0

---
 srcpkgs/python3-anyio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {

From 8b968948196d1d8b308d59f1750d5d37c2e78087 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:55:45 +0200
Subject: [PATCH 122/824] jupyterlab: update to 3.1.0, add deps

Closes: #32235 [via git-merge-pr]
---
 srcpkgs/jupyterlab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 

From be6ed42fb8fe6b2747a97b5c28883ef55109a610 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:22:05 +0200
Subject: [PATCH 123/824] xeyes: update to 1.2.0.

---
 srcpkgs/xeyes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..64ff5042d9d0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,6 +1,6 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING

From 3d2469e246a4bd6ac2e471958f16eea5764877b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:28:00 +0200
Subject: [PATCH 124/824] re2c: update to 2.2.

---
 srcpkgs/re2c/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda

From 7b6e26ca542d6d307a6fb85785b648104bc21568 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 16:34:37 +0200
Subject: [PATCH 125/824] xwd: update to 1.0.8.

Adopt.
---
 srcpkgs/xwd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING

From 2942652d4ce85856fcccb6318d23f139cea783a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Aug 2021 16:31:23 +0200
Subject: [PATCH 126/824] icdiff: update to 2.0.3.

---
 srcpkgs/icdiff/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..3af6dfdcd074 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.3
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }

From a6391eb478911a2ce0fc6cb915fe85bc5c1ac403 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 19:58:04 +0200
Subject: [PATCH 127/824] libvirt: update to 7.6.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 6ed854b7128a7db84bce534376afae41923dc784 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:00:31 +0200
Subject: [PATCH 128/824] libvirt-python3: update to 7.6.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e

From 62a3709b1bc9e11d1d999f042cbc590ab2b6d695 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:04:19 +0200
Subject: [PATCH 129/824] xeyes: add libXi-devel to makedepends

---
 srcpkgs/xeyes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 64ff5042d9d0..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"

From 7f3c99b517e78f6f95b15adbc1421942c842bb18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 19:37:54 +0200
Subject: [PATCH 130/824] tg_owt: rebuild to fix a segfault

I'm not sure what exactly caused it or what causes it,
the segfault did not happen in gdb,
instead telegram just exited normally
---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9

From 4e76ca0b13e87610b180d5b31312f19bd610a3b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:01:58 +0200
Subject: [PATCH 131/824] telegram-desktop: update to 2.9.0.

closes #32111
---
 .../0003-remove-redundant-extern-c.patch      | 28 -------------------
 srcpkgs/telegram-desktop/template             |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch

diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 42950e423afdf403db04b4df9ec0588f75b3ef00 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 22:05:48 +0200
Subject: [PATCH 132/824] musl: backport patches to fix pthread_cond_wait with
 PI mutex

https://github.com/pulseaudio/pulseaudio/blob/master/src/pulsecore/mutex-posix.c#L55
https://github.com/pulseaudio/pulseaudio/blob/master/src/pulse/thread-mainloop.c#L118

https://github.com/pulseaudio/pulseaudio/commit/413a8f8917256ef44a58fc8519bcc93644423373

pulseaudio uses a prio-inheriting mutex since the above revision
that is paised with a condition variable; the behavior of this
was broken in musl until the above patches, which would result
in pulseaudio deadlocking with gstreamer pulsesink (most often
with webkit) and possibly other things.

Fixes https://github.com/void-linux/void-packages/issues/15631
---
 .../musl/patches/fix-pi-mutex-cond-1.patch    | 56 +++++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-2.patch    | 48 ++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-3.patch    | 28 ++++++++++
 srcpkgs/musl/template                         |  2 +-
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch

diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 526a182d9bdef4401c176e47ace0133356d2732a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 31 Jul 2021 02:14:55 -0300
Subject: [PATCH 133/824] bcc: (actually) update to 0.21.0.

The unversioned file name means we can accidentally fool the distfiles
cache, so the package was built with the wrong distfiles.

We avoid this issue in the future by renaming the file to one that
contains the version.
---
 srcpkgs/bcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5fdf8be098b3..5a3e66c86c5d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
+checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2b855e52fcc047dd9eb994688931c0f2b913da81 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:53:58 +0200
Subject: [PATCH 134/824] scrot: update to 1.6.

---
 srcpkgs/scrot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh

From bb8b54a3e3efc51480c6dab404451e2738b38c77 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:52:54 +0200
Subject: [PATCH 135/824] libmbim: update to 1.26.0.

---
 srcpkgs/libmbim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"

From e9d8d473ecad40e9d28c0997d691a108f5e995ae Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 25 Jul 2021 11:15:46 +0200
Subject: [PATCH 136/824] New package: shiori-1.5.0

---
 srcpkgs/shiori/files/shiori/run |  4 ++++
 srcpkgs/shiori/template         | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template

diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}

From 18c5ca6f8beb6a38f6c33af60e1951a29e92fc5e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 23:20:05 +0200
Subject: [PATCH 137/824] bcc: use an updated libbpf to fix build on 32-bit
 systems

---
 srcpkgs/bcc/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5a3e66c86c5d..c2b7a65c19fd 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=2
+revision=3
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"

From 12f79a6f3336a2e177c02964fcd245bafd8d1e34 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 15 Aug 2020 20:57:51 +1000
Subject: [PATCH 138/824] New package : python3-RPi.GPIO-0.7.0

---
 srcpkgs/python3-RPi.GPIO/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-RPi.GPIO/template

diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}

From 8822f15cbcd902c3e5ec7c755817dd77e5b40227 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 27 Jul 2021 08:38:10 +0200
Subject: [PATCH 139/824] sslh: add patch to work with libconfig 1.7.3

---
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 2 files changed, 713 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch

diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"

From 5c81bc718b3870c4d24fa28614ee7b5d00d21866 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:38:13 +0300
Subject: [PATCH 140/824] perl-Test-Needs: update to 0.002009.

---
 srcpkgs/perl-Test-Needs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3

From bfed1bb164fed35c7e5233389f5a0ad79860a502 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:24:26 +0300
Subject: [PATCH 141/824] perl-URI: update to 5.09.

---
 srcpkgs/perl-URI/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a

From 74fb046938787094372ec43b172c780cc43fe513 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:32:02 +0200
Subject: [PATCH 142/824] sfeed_curses: update to 0.9.13.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..148f3d67f824 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=0.9.13
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
 
 post_install() {
 	vlicense LICENSE

From abd3eb5932a75b982333318bc931cfac3b22b2a4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 1 Aug 2021 09:57:54 +0200
Subject: [PATCH 143/824] mkvtoolnix: update to 60.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0875991a872f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
+version=60.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 8492465cca7202e829fd4fa2094305176d4b82f6 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 1 Aug 2021 16:10:52 +1000
Subject: [PATCH 144/824] saml2aws: update to 2.32.0

---
 srcpkgs/saml2aws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md

From ee2e4b417df573312513c4b029ffe0ded5424a16 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 31 Jul 2021 14:49:30 -0300
Subject: [PATCH 145/824] imlib2: update to 1.7.2.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING

From d79d51133a7795c30ce91c1193d7a69ef5acb05a Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Mon, 2 Aug 2021 11:47:58 -0500
Subject: [PATCH 146/824] protonvpn-cli: update to 2.2.11.

---
 srcpkgs/protonvpn-cli/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..c9a3c784ace6 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,8 +1,8 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
+version=2.2.11
 revision=1
-wrksrc="linux-cli-${version}"
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
@@ -11,5 +11,6 @@ short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks

From 4c65424e746058006221c2cf1b1e804eb9f29745 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Aug 2021 13:45:28 +0200
Subject: [PATCH 147/824] dbeaver: update to 21.1.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..b5ae64ae7d74 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
 nopie=true
 
 do_build() {

From 7709c4a46e3bd26c0c3dca7c3eef66779e95a56f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Fri, 30 Jul 2021 11:55:26 +0300
Subject: [PATCH 148/824] emptty: update to 0.6.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 76259b34714cd32f6b3af9126e82866244143fc4 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Fri, 30 Jul 2021 20:14:00 -0400
Subject: [PATCH 149/824] synapse: update to 1.39.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..b45f32817bdf 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.39.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From eebd0dd6ef328be609125345f6b68d78a8da8753 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Jul 2021 18:35:41 +0300
Subject: [PATCH 150/824] btrfs-progs: update to 5.13.1

---
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch | 56 -------------------
 srcpkgs/btrfs-progs/template                  |  6 +-
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch

diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

From bb937e8516359f896d906a54eb5f189974ee367a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 21 Jul 2021 14:11:56 +0200
Subject: [PATCH 151/824] rpi-imager: update to 1.6.2.

---
 srcpkgs/rpi-imager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 8158b933384153d954c94578c8d3c4a0f600ad96 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Wed, 21 Jul 2021 11:59:41 -0700
Subject: [PATCH 152/824] zola: update to 0.14.0

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From da39ce8d105103e65958ba2d1f541472f2f0de1b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 17:52:41 +0300
Subject: [PATCH 153/824] dialog: update to 1.3.20210621.

---
 srcpkgs/dialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib

From a286d255e4c156b37ca823fe5d3db29b062e363f Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Thu, 29 Jul 2021 16:04:06 +0600
Subject: [PATCH 154/824] crun: update to 0.21.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From f45e582f9ae21b82224ec627bbc3355d06d28f4c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 29 Jul 2021 19:51:53 +0000
Subject: [PATCH 155/824] strace: update to 5.13.

---
 srcpkgs/strace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"

From 8e78b7ffc1c6c47e04198edbd95ab57e2d8cf8af Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 1 Aug 2021 11:52:23 +0300
Subject: [PATCH 156/824] vc: update to 1.4.2.

---
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch | 31 +++++++++++++++++++
 srcpkgs/vc/template                           |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch

diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE

From 87f90aaaaaf0b8aeb77de6a9434f98868f0dbb15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:43:50 +0200
Subject: [PATCH 157/824] neatvi: update to 09.

---
 srcpkgs/neatvi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex

From a63d20a6891426469e0c2f5f553a07cc0fa8dda8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:44:49 +0200
Subject: [PATCH 158/824] skaffold: update to 1.29.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..663f97e1f5f0 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.29.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046

From 751bab7ffff3012dcf4bd87f8b0f86263a5c8ce0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:45:35 +0200
Subject: [PATCH 159/824] byacc: update to 20210802.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..db54998f0f25 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210802
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 12130e2bf2e4e0c2a624fec021272bf4552c7a5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:46:11 +0200
Subject: [PATCH 160/824] minify: update to 2.9.21.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE

From ce36ce06f777aba0413bf268523fe8d0064a37b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:49:15 +0200
Subject: [PATCH 161/824] stress-ng: update to 0.13.00.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd

From d946fa51e2e5208dc9fc3c82854cb07cbd6a7d86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:53:16 +0200
Subject: [PATCH 162/824] crawl: update to 0.27.0.

---
 srcpkgs/crawl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 66e60f98d0f9acec997eed53e4db6c10dc8e5ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:55:47 +0200
Subject: [PATCH 163/824] crawl-tiles: update to 0.27.0.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 7a7362867fee3361e82a713d53f421d620ce8f40 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 14:52:47 +0200
Subject: [PATCH 164/824] syncthing: update to 1.18.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \

From 5054eeb32fd32539b2841303467316c079f219b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:41:20 -0400
Subject: [PATCH 165/824] python3-scipy: update to 1.7.1.

---
 srcpkgs/python3-scipy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 

From bbfb3428f692c64c9023ba0ae2c4273dd3e4013e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:42:34 -0400
Subject: [PATCH 166/824] python3-ipython: update to 7.26.0.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 9f8c9e8acad8cde2c0f61481fee1ea36ef7afc3c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 3 Aug 2021 17:42:05 +0200
Subject: [PATCH 167/824] warzone2100: update to 4.1.2.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..d878605ff26a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.2
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 1b02a7875d62626de377db501d29e03a5460e3d3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 18:02:07 +0200
Subject: [PATCH 168/824] restic: update to 0.12.1.

---
 srcpkgs/restic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE

From b22b739d19e707b0801065ca0c813a3f4ea9bbe5 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 3 Aug 2021 13:50:11 +0200
Subject: [PATCH 169/824] vips: update to 8.11.2.

---
 srcpkgs/vips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"

From b6a3541047198e846495fe5800601ce71d5a9307 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 3 Aug 2021 13:06:35 +0200
Subject: [PATCH 170/824] google-chrome: update to 92.0.4515.131

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 4f0f4ff21a2e9fccb65935d9dc8d6b34491db428 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:21 +0200
Subject: [PATCH 171/824] knot: update to 3.1.0.

---
 common/shlibs         | 4 ++--
 srcpkgs/knot/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index da24f1de5810..f768a637aed5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3678,9 +3678,9 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
 libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..2188e92dac8b 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From c705c309f06982619f4cf87eee6131b5aee801f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:57 +0200
Subject: [PATCH 172/824] knot-resolver: rebuild against knot-3.1.0_1

---
 srcpkgs/knot-resolver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b07a400a3a02..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
 version=5.4.0
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled

From 3af8ef01c784b1ec70b76589ed95c856e1b1e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 3 Aug 2021 20:36:16 +0200
Subject: [PATCH 173/824] firefox-i18n: update to 90.0.1.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..d1526dfa7ba1 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
+ 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
+ a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
+ 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
+ ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
+ 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
+ d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
+ ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
+ 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
+ ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
+ 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
+ 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
+ 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
+ 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
+ bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
+ 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
+ e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
+ cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
+ 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
+ df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
+ 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
+ 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
+ cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
+ dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
+ 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
+ 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
+ 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
+ c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
+ b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
+ 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
+ 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
+ b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
+ 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
+ e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
+ 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
+ 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
+ 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
+ e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
+ 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
+ befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
+ e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
+ 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
+ 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
+ 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
+ ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
+ d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
+ f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
+ 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
+ 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
+ db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
+ a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
+ d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
+ fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
+ c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
+ a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
+ a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
+ c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
+ b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
+ 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
+ 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
+ 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
+ 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
+ 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
+ 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
+ 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
+ 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
+ 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
+ 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
+ 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
+ a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
+ b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
+ 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
+ a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
+ a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
+ cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
+ dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
+ 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
+ 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
+ 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
+ b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
+ 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
+ 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
+ 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
+ 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
+ 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
+ c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
+ f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
+ e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
+ e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
+ 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
+ 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
+ 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
+ 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
+ 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
+ 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
+ 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"

From eb18dda697776e74fb93e4d0903ea24a6dff83fa Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 2 Aug 2021 09:09:50 +0300
Subject: [PATCH 174/824] khal: update to 0.10.4.

---
 srcpkgs/khal/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \

From c953a74395992461d1273e5463849a873109a39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 3 Aug 2021 18:29:40 -0300
Subject: [PATCH 175/824] util-linux: backport sulogin(8) fix.

sulogin wasn't actually logging in, making single user mode useless.

Reported by kciN on IRC.
---
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 41bffc545884..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From aa3de6857265bff30ec3dba020c880763fba7b18 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 31 Jul 2021 19:57:01 +0200
Subject: [PATCH 176/824] python3-astroid: update to 2.6.5, adopt

---
 srcpkgs/python3-astroid/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7

From 041a71e4789318e861d934139d62ee4da01420d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Aug 2021 00:10:46 +0200
Subject: [PATCH 177/824] pylint: update to 2.9.6, adopt

---
 srcpkgs/pylint/patches/fix-tests.patch | 13 +++++++++++++
 srcpkgs/pylint/template                | 24 ++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch

diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {

From b589ff1e465f2798060023dc68e788763d988774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:04:17 -0300
Subject: [PATCH 178/824] New package: linux-base-2021.07.21

Base package to be used as dependency for linux and linux-lts. This way
they can share the same code and users who want to stick with a given
kernel version can just install that one and linux-base instead of
needing the linux or linux-lts meta and ignorepkg dances.
---
 srcpkgs/linux-base/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/linux-base/template

diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac

From b6dc0b0edea9c0a2863c38b3c8524b76ce9f4030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:31 -0300
Subject: [PATCH 179/824] linux: update to 5.13.

Also move to using linux-base.
---
 srcpkgs/linux/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From 64b3e1c06829131862063aa92a77d33874c2b2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:46 -0300
Subject: [PATCH 180/824] linux-lts: update to 5.10.

Also move to using linux-base and xlint.
---
 srcpkgs/linux-lts/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From a524266ac3a6da955dac28ceb353dccc712f1815 Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:43:30 -0700
Subject: [PATCH 181/824] cc65: update to 2.19.

---
 srcpkgs/cc65/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 

From 20a66d1bdf525bee71cad5c20b7fb8f86a6f60af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:08:46 -0700
Subject: [PATCH 182/824] CLion: update to 2021.2.

---
 srcpkgs/CLion/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..f2ab575cea34 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -28,8 +28,19 @@ post_extract() {
 	# Remove files for other CPU architectures
 	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/arm
 	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
@@ -37,6 +48,7 @@ post_extract() {
 			rm -rf bin/clion.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/performanceTesting/bin/libyjpagent.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
 		i686)
@@ -44,6 +56,7 @@ post_extract() {
 			rm -rf bin/clion64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac

From d8a2549a152025edfce521d6f568458bf2e59fad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:26:08 +0300
Subject: [PATCH 183/824] bmake: update to 20210704.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..17f5dc72ad89 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210704
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
 python_version=3
 
 do_configure() {

From b5d6157d8c38272c5b02af4cbce71f77edbcc34a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:35:29 +0300
Subject: [PATCH 184/824] help2man: update to 1.48.3.

---
 srcpkgs/help2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes

From 07fef5810a29deb931d78733432358866c11d501 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 15:48:40 +0200
Subject: [PATCH 185/824] apk-tools: update to 2.12.7.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {

From 1e02f8dfbc517088661a976aca9b70376df9463e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:25:52 +0200
Subject: [PATCH 186/824] erlang: update to 24.0.5.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a5d45ab414757f79ea0be705957c0b445d189add Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:26:13 +0200
Subject: [PATCH 187/824] linux5.13: update to 5.13.8.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..43a3f6aa16a6 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 4dc9936a2e1cca6b2e19d6cfb750c6a05cf95b66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:28:18 +0200
Subject: [PATCH 188/824] linux5.10: update to 5.10.56.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 2832c9d04add..6242d17550e8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.54
+version=5.10.56
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
+checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 5230843f9f369e1c35f3f2617cbeadbe55c37f8e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voiceops.com>
Date: Wed, 4 Aug 2021 13:09:36 -0500
Subject: [PATCH 189/824] New package: sftpgo-2.1.0

---
 srcpkgs/sftpgo/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/sftpgo/template

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}

From d94728b669adf92dc8599479aa827850ac210405 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:56:10 +0200
Subject: [PATCH 190/824] icdiff: update to 2.0.4.

---
 srcpkgs/icdiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 3af6dfdcd074..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,6 +1,6 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.3
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 5a818992ea80ead45c200f5be0d3eaea66d0d287 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:57:32 +0200
Subject: [PATCH 191/824] prosody: update to 0.11.10.

Fixes CVE-2021-37601.
---
 srcpkgs/prosody/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"

From 52ed770d2b8e2290f6fb3c3534b6f662c9e3b581 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 3 Aug 2021 10:37:50 +0200
Subject: [PATCH 192/824] fail2ban: update to version 0.11.2

---
 srcpkgs/fail2ban/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3

From adc05833a68047f4608d678f41997bce7058f0b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 193/824] New package: python3-smartypants-2.0.1

---
 srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-smartypants/template

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}

From eb7520cc8138b52fdb76d726d62ad9b34d26a453 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 194/824] New package: python3-typogrify-2.0.7

---
 srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-typogrify/template

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}

From baecb2ac5562176dc002099a13e34a5f6c6373af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 195/824] New package: gi-docgen-2021.6

---
 srcpkgs/gi-docgen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gi-docgen/template

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails

From 775f1e9500d13aa060d8aa56828bf5d09a157a52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 7 Jul 2021 17:08:00 +0200
Subject: [PATCH 196/824] sysprof: update to 3.40.1.

---
 srcpkgs/sysprof/patches/build.patch |  10 --
 srcpkgs/sysprof/patches/musl.patch  | 157 ----------------------------
 srcpkgs/sysprof/template            |  12 +--
 3 files changed, 4 insertions(+), 175 deletions(-)
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch

diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }

From 1584f6641ac5a455f978b45a9ca7a26d00514b0a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Jun 2021 23:48:13 +0200
Subject: [PATCH 197/824] gtk4: update to 4.2.1, split docs, enable sysprof

---
 srcpkgs/gtk4-doc                       |  1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch | 23 ++++++++++++++++
 srcpkgs/gtk4/template                  | 36 +++++++++++++++++++-------
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch

diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 9b48a4f0c5e0ccbf17074cbab54691352179009c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 20:56:22 +0200
Subject: [PATCH 198/824] electrum: update to 4.1.5.

---
 srcpkgs/electrum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From b14cef1cd92d5a3253b5e42bd43d46ba1e5c9c3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Jul 2021 11:01:29 +0200
Subject: [PATCH 199/824] libinput: update to 1.18.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From fdc57786c3644bdc6ab6ba5cb566fd0b49bd0951 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Thu, 5 Aug 2021 11:10:15 -0400
Subject: [PATCH 200/824] shotcut: remove qt5-webkit-devel dep

shotcut does not use webkit since
https://github.com/mltframework/shotcut/commit/a44fe75a4dc7410668935cd0d3470994f5997571.
no revbump because this is purely build-time change.
---
 srcpkgs/shotcut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"

From 57b2e19a9775e63efac22754aae3125e0db87bd0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 19:56:44 +0300
Subject: [PATCH 201/824] notcurses: update to 2.3.13.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 4b3563f65ffc..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 0460665ab43b95d2d95e960995315ad6742f4610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 5 Aug 2021 09:27:02 -0300
Subject: [PATCH 202/824] nvidia: fix proton errors.

Proton sometimes errors out with:

  The NVIDIA driver was unable to open
  'libnvidia-glvkspirv.so.470.57.02'. This library is required at run
  time.

This is caused by an out of date glibc cache, so we now run ldconfig in
INSTALL. This solution was pointed out by mvf.

Unfortunately, this isn't the entirely correct solution: ldconfig should
always be run after package installations that touch /usr/lib, to avoid
similar issues. Until there's a simple solution for it (maybe general
purpose XBPS hooks), this is the best we can do.

Fixes: #32222
---
 srcpkgs/nvidia/INSTALL  | 3 +++
 srcpkgs/nvidia/template | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia/INSTALL

diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..9c022ef65649 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.57.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"

From f6b8a366742d1dd5b1441a4b7c20de270d56765a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:01:56 +0300
Subject: [PATCH 203/824] font-awesome5: update to 5.15.4.

Also:
- add changelog.

Closes: #32339 [via git-merge-pr]
---
 srcpkgs/font-awesome5/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From cffe7b20ded28ae8e17c9a516a4806804da3d525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A9TwT?= <vcyzscape@gmail.com>
Date: Fri, 6 Aug 2021 00:55:17 +0700
Subject: [PATCH 204/824] zoom: update to 5.7.28991.0726_1

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 31e39b774927db23b617ebc30c1a6c33bdae4791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 12:49:42 +0200
Subject: [PATCH 205/824] ipset: update to 7.15.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 51150121385d..77c85ff074f7 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.14
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"

From 0f9a42818c53870137cfc6378cb25d9dffc47197 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:36:27 +0200
Subject: [PATCH 206/824] extrace: update to 0.8.

---
 srcpkgs/extrace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE

From 8008a848bc7a8836c1385d51ec0968e9b2893f17 Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Mon, 12 Jul 2021 04:17:31 -0600
Subject: [PATCH 207/824] arcan: add arcan_sdl subpackage

arcan_sdl allows the running of arcan nested within a different
display server.
---
 srcpkgs/arcan/template | 13 +++++++++++--
 srcpkgs/arcan_sdl      |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/arcan_sdl

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file

From 44489c0572dd28b893cbbd7b8f01344fffb42c9d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:28:11 +0300
Subject: [PATCH 208/824] papirus-icon-theme: update to 20210802.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons

From bedb3f4adaf05a24eb610988b81300221ca49c02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:45:16 +0200
Subject: [PATCH 209/824] ipset: fix checksum.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 77c85ff074f7..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"

From cabb68f88c11f25e2fd64ef07094b48fcde2bdef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 5 Aug 2021 22:51:37 +0200
Subject: [PATCH 210/824] New package: abcmidi-2021.06.27

---
 srcpkgs/abcmidi/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/abcmidi/template

diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38

From 5894e93b0d0bfca141bc90ee284e4f8aae9b2840 Mon Sep 17 00:00:00 2001
From: Wes Roberts <takq@a.zinc.email>
Date: Thu, 5 Aug 2021 18:12:44 -0400
Subject: [PATCH 211/824] timeshift: fix compatibility with util-linux 2.37.1.

Timeshift will only start in "Live USB Mode".

Upstream issues:
https://github.com/teejee2008/timeshift/issues/425
https://github.com/teejee2008/timeshift/issues/753
https://github.com/teejee2008/timeshift/issues/755
---
 srcpkgs/timeshift/patches/d437358a.patch | 23 +++++++++++++++++++++++
 srcpkgs/timeshift/template               |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"

From 9bec1e96b1926f251236462d95e629676763a590 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 5 Aug 2021 23:28:12 +0200
Subject: [PATCH 212/824] hcloud: update to 1.26.1.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE

From 129ec18d7a5ac3f01744aa231d05858648a360f0 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 5 Aug 2021 21:29:38 +0300
Subject: [PATCH 213/824] zoxide: update to 0.7.3.

---
 srcpkgs/zoxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE

From d2b42cca2ea516b3c2b8e7cdc180eaf98801c787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 22:11:18 -0300
Subject: [PATCH 214/824] virtualbox-ose: update to 6.1.26.

Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.

Fix build by setting the correct Qt5 base include path.
---
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 +
 srcpkgs/virtualbox-ose/template              | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {

From 854401248781e1e81f6afcb1ab2370199069e7b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 14:51:17 +0200
Subject: [PATCH 215/824] nncp: update to 7.5.1.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 279d6235b763..48ae842e0016 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.0
+version=7.5.1
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
+checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
 
 do_build() {
 	make

From 9ee4b4d2900632f8337e3a0825c62c3d1bbe1025 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:02:39 +0200
Subject: [PATCH 216/824] python3-pipx: update to 0.16.4.

---
 srcpkgs/python3-pipx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE

From d95459c1d2c7a72889c8556c60aefab2ec2bb9ba Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 5 Aug 2021 22:58:59 +0300
Subject: [PATCH 217/824] jrnl: update to 2.8.2.

---
 srcpkgs/jrnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no

From 0bcecfb7e9fbcb555cdccd06ef3267dc5f654ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:48 +0700
Subject: [PATCH 218/824] cmake: update to 3.21.1.

---
 srcpkgs/cmake/patches/ar-lwyu.patch           | 20 +++++++++
 .../patches/ignore-crape-compiler-test.patch  | 13 ++++++
 srcpkgs/cmake/patches/test-none.patch         | 41 -------------------
 srcpkgs/cmake/template                        | 11 ++---
 4 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do

From 2f4afa8f1abfddd2c577a35847f1196ee2d52840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:56 +0700
Subject: [PATCH 219/824] cmake-gui: update to 3.21.1.

---
 srcpkgs/cmake-gui/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.

From 3ebca62316bbab53b59e1d9d7fd2dbf4db6baee7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:27:38 +0200
Subject: [PATCH 220/824] bcc: link LLVM dynamically.

As a distro, we want this anyway, but static linking also broke, e.g.
bpftrace: https://github.com/iovisor/bpftrace/issues/1855
---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index c2b7a65c19fd..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=3
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"

From 374f72032c4a8a3c6cda89db5f5bcb31c603c015 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:28:42 +0200
Subject: [PATCH 221/824] bpftrace: rebuild against bcc-0.21.0_4.

---
 srcpkgs/bpftrace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..8ca8a7f2409f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run

From 19cdce0d2be1f7e61e38bea75aae7a1093ab60e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 16:20:59 +0200
Subject: [PATCH 222/824] bpftrace: set nostrip.

---
 srcpkgs/bpftrace/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 8ca8a7f2409f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools

From 6876e80203dbaa9430a022ad3b5ba87cfe223243 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:52:35 -0400
Subject: [PATCH 223/824] cpp-utilities: update to 5.11.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 4cd28529efe0f1a6bfd1fed0663e81e0a1dd0fef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:53:14 -0400
Subject: [PATCH 224/824] tageditor: update to 3.4.2.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 2adc3fa61cb6f9d7c7bd8bf340c6e7a6b0abb665 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:54:25 -0400
Subject: [PATCH 225/824] python3-pyzmq: update to 22.2.1.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 84958059cef86cef3da7be9fff21ed2057c18bfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 12:42:19 -0400
Subject: [PATCH 226/824] python3-pip: update to 21.2.3.

---
 srcpkgs/python3-pip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 3e800139d4da..225ede1ccd09 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.2
+version=21.2.3
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
+checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
 # Tests have unpackaged dependencies
 make_check=no
 

From 502aca3c9b04f46be25bc819ca48f5e3eb30f26f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 22 Jul 2021 17:41:10 +0200
Subject: [PATCH 227/824] zsh-autosuggestions: update to 0.7.0.

---
 srcpkgs/zsh-autosuggestions/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }

From 92d6280a14f6c284675a56158d8ccacf7f522437 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:05:59 +0200
Subject: [PATCH 228/824] gotop: update to 4.1.2.

---
 srcpkgs/gotop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE

From c49272fd95e01b152dfe2688adcd5bb88aae65d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:01:55 +0200
Subject: [PATCH 229/824] vala: update to 0.52.4.

---
 common/shlibs                                 |  2 +-
 .../vala/patches/disable-unstable-tests.patch | 14 ++++++++++++++
 srcpkgs/vala/template                         | 19 ++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..7a0c44e9a713 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {

From 5a574082dbe375ec54e45aa8449529b23bc1af72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:08:12 +0200
Subject: [PATCH 230/824] valadoc: update to 0.52.4.

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/patches  | 1 +
 srcpkgs/valadoc/template | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/valadoc/patches

diff --git a/common/shlibs b/common/shlibs
index 7a0c44e9a713..7e6b6fb0d1d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,7 +3120,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if

From d6b24ecc0fb30fd95d6f1eda42e91f233f1b4022 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:05:29 +0200
Subject: [PATCH 231/824] vala-language-server: update to 0.48.3.

---
 srcpkgs/vala-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b

From 4717e3aec14874e82f674d88d446373fff7c83bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:19:57 +0200
Subject: [PATCH 232/824] io.elementary.code: rebuild with vala-0.52.4

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"

From 9b0fdff4cded06134732af00683c9e98bf9eb0af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:20:11 +0200
Subject: [PATCH 233/824] valabind: update to 1.8.0.

---
 srcpkgs/valabind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd

From 13f86007f290ac649623c61bd7fcd79fc0f7d363 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:47:45 +0200
Subject: [PATCH 234/824] bomi: remove package.

Unmaintaned and broken, UI doesn't work.

Upstream issue:
https://github.com/ashinan/bomi/issues/540
---
 srcpkgs/bomi/patches/ffmpeg3.x.patch    |  32 ----
 srcpkgs/bomi/patches/ffmpeg4.patch      | 195 ------------------------
 srcpkgs/bomi/patches/fix-cxx14.patch    |  67 --------
 srcpkgs/bomi/patches/fix-sysctl_h.patch |  22 ---
 srcpkgs/bomi/template                   |  35 -----
 5 files changed, 351 deletions(-)
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template

diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}

From ab99118686705a9ab6544f276fa4a111b04e78a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 6 Aug 2021 16:25:50 -0300
Subject: [PATCH 235/824] removed-packages: add bomi and revbump.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..78ba7731cc3e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=47
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1

From bc22494d4291a69d0092a0bbb3b6f673f4ab3b0b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:18:21 +0200
Subject: [PATCH 236/824] dlayer: update to 0.3.1.

---
 srcpkgs/dlayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE

From 254efe85bb67582197d97c26c96ca7f25a2f6b90 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:19:37 +0200
Subject: [PATCH 237/824] skopeo: update to 1.4.0.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 963354f1ae33f73e28b47f7c43dd39dffa0ec20c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 22:36:22 +0300
Subject: [PATCH 238/824] font-sarasa-gothic: update to 0.34.1.

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 

From ba75905a75bc9e5a7591c48716f7bda0fef9c4ef Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 10:05:46 +0200
Subject: [PATCH 239/824] libid3tag: fix distfiles + lint error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

used mirror distfiles.exherbo.org doesn’t respond anymore
use original sourceforge download site
---
 srcpkgs/libid3tag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {

From 36ad4020678ac2f953103cc8afcaf1dac8eeea6a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 6 Aug 2021 21:36:05 +0200
Subject: [PATCH 240/824] vscode: update to 1.59.0

---
 srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++--
 srcpkgs/vscode/patches/gulp.patch                 | 4 ++--
 srcpkgs/vscode/patches/remove_git_command.patch   | 5 +++--
 srcpkgs/vscode/template                           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 80708719fe8b7ddd2f42603993e5c8ba613b54b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 09:53:55 +0200
Subject: [PATCH 241/824] New package: snowball-2.1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libstemmer                            |  1 +
 srcpkgs/libstemmer-devel                      |  1 +
 .../snowball/patches/libstemmer-library.patch | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template

diff --git a/common/shlibs b/common/shlibs
index 7e6b6fb0d1d6..b8fda590d5f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}

From bc4c6cb0d5c0aa2a6b01e74265a0dfe5db512ecc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 242/824] geary: update to 40.0.

---
 srcpkgs/geary/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..3891e7190112 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

From 968904ad6a86d9b6be8ed1ccdb1045d2123bec18 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Fri, 6 Aug 2021 13:23:34 +0200
Subject: [PATCH 243/824] ugdb: update to 0.1.10.

---
 srcpkgs/ugdb/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE

From ba980cfa21beda60a7fa605bb3f8756831e7a337 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Fri, 6 Aug 2021 21:27:50 +0300
Subject: [PATCH 244/824] protonvpn-cli: add missing dependency

---
 srcpkgs/protonvpn-cli/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index c9a3c784ace6..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,12 +1,13 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.11
-revision=1
+revision=2
 wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"

From ca8150ce4cc4b3ced76f14e6484e881c09c2f93d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:43:36 +0200
Subject: [PATCH 245/824] github-cli: update to 1.14.0.

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date

From 743521e5a23eb9c520f7a2c2952c92574ae2c3d8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:53:39 +0200
Subject: [PATCH 246/824] sigil: update to 1.7.0.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 5b5e97490323801ee94d64b79652df6c30294dd1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:24:59 +0200
Subject: [PATCH 247/824] go: update to 1.16.7.

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 

From fbcba68bfe881cda65e458eb75ffef56b0f19140 Mon Sep 17 00:00:00 2001
From: notthewave <74874782+notthewave@users.noreply.github.com>
Date: Sat, 3 Jul 2021 00:25:52 +0200
Subject: [PATCH 248/824] New package: ART-1.9.3.

Since ART is a RawTherapee fork, the template is basically the same,
with the addition of exiv2 as a dependency.
---
 srcpkgs/ART/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/ART/template

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e

From 28d4b10e5b32aeea8ee2b1bbfb461a2015e0b211 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:24:34 +0200
Subject: [PATCH 249/824] linux5.4: update to 5.4.138.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 807b6b49c848..c204d64759c3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.137
+version=5.4.138
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
+checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 9878fd2de973a59bffb1c255592270feeae544a1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:26:19 +0200
Subject: [PATCH 250/824] linux4.19: update to 4.19.201.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1962af9c6030..b79ed782a91c 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.200
+version=4.19.201
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 102da5a85235e383eb0c495bfa94020d8bf75f76 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:58:04 +0200
Subject: [PATCH 251/824] portage: update to 3.0.21.

---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf

From 23a767713446cfa50990e10aa72b27120714c52e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:07:47 +0200
Subject: [PATCH 252/824] xdotool: update to 3.20210804.2.

---
 srcpkgs/xdotool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 

From 07f9273e5a5c37ddb88317ea79b611d51b0c0d59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:08:32 +0200
Subject: [PATCH 253/824] perl-WWW-Mechanize: update to 2.04.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171

From e2b8cd3e1d774ea4297f4af6106ce39835fa9ea3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:29 +0200
Subject: [PATCH 254/824] dovecot: update to 2.3.16.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..27a781db5139 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
+version=2.3.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 70024136da59051446248930ca54551f5e353f42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:33 +0200
Subject: [PATCH 255/824] dovecot-plugin-pigeonhole: update to 0.5.16.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7e6a1f9ee8332df0bfe312d1badcfdfc95031b14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:43:05 +0200
Subject: [PATCH 256/824] lnav: update to 0.10.0.

---
 srcpkgs/lnav/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..93df79547535 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=

From 09af66c6b63044f3d71fee9c9fc7a74c01f5850e Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:39:54 +0000
Subject: [PATCH 257/824] firefox: orphan

---
 srcpkgs/firefox-i18n/template | 2 +-
 srcpkgs/firefox/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index d1526dfa7ba1..755b02d248c0 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -4,7 +4,7 @@ version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..08c8efadf2d9 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -7,7 +7,7 @@ version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"

From 9b34a80f664a130538039138140dbb8e536ade0f Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:29 +0000
Subject: [PATCH 258/824] ImageMagick: orphan

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"

From dfe008e9d639642fe30b32151e1e264319f0e803 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:37 +0000
Subject: [PATCH 259/824] ImageMagick6: orphan

---
 srcpkgs/ImageMagick6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 7fbcb1d3150c..213d98a37659 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -16,7 +16,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
  libwmf-devel ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"

From a3d08f2bd9d82b3952d17c7737d615d319afc0ce Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:20 +0000
Subject: [PATCH 260/824] cbindgen: orphan

---
 srcpkgs/cbindgen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"

From 5d67e15c2385006a3eaa7262f47f8a740a26aabd Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:35 +0000
Subject: [PATCH 261/824] cozy: orphan

---
 srcpkgs/cozy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b198300da9a4..b08360fffde3 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -11,7 +11,7 @@ depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"

From 95dfe3c79e96766c45590a8fa5162047379ed6be Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:54 +0000
Subject: [PATCH 262/824] ffmpeg: orphan

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..0a0d24683082 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -4,7 +4,7 @@ pkgname=ffmpeg
 version=4.3.2
 revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"

From 9a03a5c9a5e89eacb96e9d2fe47bba49a3f2b1ed Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:12 +0000
Subject: [PATCH 263/824] iverilog: orphan

---
 srcpkgs/iverilog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"

From 140ba315a83771a84c78514c6fa5d92b0d5736fe Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:29 +0000
Subject: [PATCH 264/824] kdenlive: orphan

---
 srcpkgs/kdenlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"

From 7c1e5477b36fd376d81262146fbd14a1fd14fdc4 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:50 +0000
Subject: [PATCH 265/824] mercurial: orphan

---
 srcpkgs/mercurial/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"

From 269f0db128a78a3f256a44ddef71dae4ab25e395 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:14 +0000
Subject: [PATCH 266/824] nv-codec-headers: orphan

---
 srcpkgs/nv-codec-headers/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"

From 5abc8ca58f11c09775a3cb1d78c3c842133c23eb Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:33 +0000
Subject: [PATCH 267/824] olive: orphan

---
 srcpkgs/olive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"

From 4a740196ba8e5fc89c47843d44eaefde9ade94e2 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:43 +0000
Subject: [PATCH 268/824] papi: orphan

---
 srcpkgs/papi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"

From a611ef27b5a4b6ae490b305f68eb8e16352eedf8 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:44:02 +0000
Subject: [PATCH 269/824] postgresql: orphan

---
 srcpkgs/postgresql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..6c30501a7c61 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -13,7 +13,7 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"

From 14a7606b7a5c30b608f82a1c89b760765295201e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 18:01:30 +0200
Subject: [PATCH 270/824] lnav: fix cross.

---
 srcpkgs/lnav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 93df79547535..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh"
+hostmakedepends="automake openssh zlib-devel"
 makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
  pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"

From fdaa57f8a159c19725b5b7378abfd9a7a6a05fb2 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 7 Aug 2021 09:54:19 +0200
Subject: [PATCH 271/824] imv: update to 4.3.0.

---
 srcpkgs/imv/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..608cc8790641 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {

From c80b668161e2484d9369136d262ebd800abfe485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 7 Aug 2021 11:04:45 +0200
Subject: [PATCH 272/824] mpd: update to 0.22.10.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 27a32ccbceb78639d59262751ca9445621a2c707 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Fri, 6 Aug 2021 16:45:33 +0200
Subject: [PATCH 273/824] herbstluftwm: update to 0.9.3

small cosmetic issues
---
 srcpkgs/herbstluftwm/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE

From 7c66d8efcd675cecba9b3712a739f5d7e006eede Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:25:58 -0700
Subject: [PATCH 274/824] hydroxide: update to 0.2.20.

---
 srcpkgs/hydroxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE

From 605d061d5abdf8f71342025f16dab899357946c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 19 Jul 2021 16:48:03 +0200
Subject: [PATCH 275/824] New package: tootle-1.0

---
 srcpkgs/tootle/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tootle/template

diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496

From 58fb5c7cdd01e43c8443c04e3010c8493b3e206e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 21:27:15 +0200
Subject: [PATCH 276/824] graphviz: depend on a default font.

With no fonts available (e.g. chroots), graphviz crashes in pango:
https://gitlab.gnome.org/GNOME/pango/-/issues/588

Depend on liberation fonts which provides the default
times font and most people have it anyway.
---
 srcpkgs/graphviz/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"

From 282e14fcf6ccabd1f45066410afa8c3d9cb0d32f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 7 Aug 2021 21:49:21 +0200
Subject: [PATCH 277/824] lowdown: update to 0.8.6.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md

From 80a6ab44f7ec23b84ead8d95eaa47b97f12c1de3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 7 Aug 2021 15:47:17 +0200
Subject: [PATCH 278/824] freerdp: update to 2.4.0

---
 srcpkgs/freerdp/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;

From 608641723e6d9220f67da6fe454152f4d761ed04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 Aug 2021 00:27:31 +0200
Subject: [PATCH 279/824] lynx: update to 2.9.0dev.9.

---
 srcpkgs/lynx/template | 11 +++++------
 srcpkgs/lynx/update   |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/lynx/update

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"

From 34bca945bff8857d1f322ad7d43fb268c264ad42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 00:19:58 +0300
Subject: [PATCH 280/824] cherrytree: update to 0.99.39.

---
 srcpkgs/cherrytree/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..8789cd37dba7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
+version=0.99.39
 revision=1
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From 26e54c12322dd1c90732727fec6e93c1f2f6b441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 Aug 2021 09:45:27 +0700
Subject: [PATCH 281/824] deluge: allow deluged to be run as different user

Close: #31690
---
 srcpkgs/deluge/files/deluged/run       |  2 +-
 srcpkgs/deluge/patches/drop-priv.patch | 40 ++++++++++++++++++++++++++
 srcpkgs/deluge/template                |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From 06ab55e8270708fcc82e4a52ece5e5577e9b24f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 Aug 2021 11:23:37 +0700
Subject: [PATCH 282/824] vcompletion: return failure on wrong arguments

---
 common/environment/setup/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }

From 492271c9fc454062eb08a9ffe2f350daec3e5a7e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:46:47 +0300
Subject: [PATCH 283/824] cozy: update to 1.1.0.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b08360fffde3..652ed886f3a9 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38

From 892f523e7e757f0dfd6c5fb803aaa91efb851596 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 284/824] New package: libadwaita-1.0.0alpha2

---
 common/shlibs                                 |  1 +
 srcpkgs/libadwaita-demo                       |  1 +
 srcpkgs/libadwaita-devel                      |  1 +
 .../patches/disable-broken-tests.patch        | 10 ++++
 srcpkgs/libadwaita/template                   | 59 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template

diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5affb5dc09fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,6 +3511,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..cb23b656c004
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-$_ver"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}

From ab0d770562498a79130285857cdf67778f03d46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 8 Aug 2021 19:08:49 +0200
Subject: [PATCH 285/824] croc: update to 9.2.1.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE

From ddc8f62e4399ab67bd4732f6acf5e46dfb8b501d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 22:09:09 +0300
Subject: [PATCH 286/824] putty: update to 0.76.

Also:
- add changelog.
---
 srcpkgs/putty/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 

From 9b2c36a8b91becf6543c38a797e606349dd77090 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:03:59 +0300
Subject: [PATCH 287/824] gpodder: update to 3.10.21.

Also:
- add necessary packages to depends and checkdepends.
---
 srcpkgs/gpodder/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest

From 2499cf0b5a483525eff55cf577b4b3e02a36eb22 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:05:09 +0300
Subject: [PATCH 288/824] New package: python3-pytest-httpserver-1.0.1

---
 srcpkgs/python3-pytest-httpserver/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-httpserver/template

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..d866ff71c6df
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc="pytest-httpserver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}

From c1248239e3d1d845a0fd8ecda77668aa090a50b9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:27:52 +0300
Subject: [PATCH 289/824] bmake: update to 20210803.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 17f5dc72ad89..ef3463e7e554 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210704
+version=20210803
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
+checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
 python_version=3
 
 do_configure() {

From 70b94605bbe99daafa44a0fcaf0245b583b1b697 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 21:58:01 +0300
Subject: [PATCH 290/824] stremio-shell: update to 4.4.142.

---
 srcpkgs/stremio-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From 8c27555a6c6731f13e8aa057873b867bf2deddc6 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 7 Aug 2021 15:39:08 +0200
Subject: [PATCH 291/824] master-pdf-editor: update to 5.7.90.

---
 srcpkgs/master-pdf-editor/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5

From 453386dbdac634d5dc140c95efd00baa7cdd03e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:03:39 +0300
Subject: [PATCH 292/824] catfish: update to 4.16.2.

---
 srcpkgs/catfish/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b

From 9bf235b9d5e81647fe54bd0b6465f4357fded2cc Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:15:35 +0200
Subject: [PATCH 293/824] py3status: update to 3.38.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE

From b2399646a26826dc4a01c2cbc1af526426561c74 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 7 Aug 2021 11:05:38 +0300
Subject: [PATCH 294/824] sdparm: update to 1.12.

---
 srcpkgs/sdparm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING

From 62f3090fb014cd7828bd49f943c55042c8a7964c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:09:34 +0300
Subject: [PATCH 295/824] xfce4-sensors-plugin: update to 1.4.1.

Closes: #32391 [via git-merge-pr]
---
 srcpkgs/xfce4-sensors-plugin/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 2af12665cb84dbc8b851fd98327cda7898c5921c Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 7 Aug 2021 18:33:22 +0530
Subject: [PATCH 296/824] Komikku: update to 0.30.0.

---
 srcpkgs/Komikku/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..7a612602214d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
-revision=2
+version=0.30.0
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6

From 5f37e142e6f6e59c409f2de0cdf7f0e26a231cff Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:19:29 +0200
Subject: [PATCH 297/824] drone-cli: update to 1.3.0.

---
 srcpkgs/drone-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c

From 61595973d6eb4ef354a25136538bc8003ec511c6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:43:00 +0200
Subject: [PATCH 298/824] gparted: update to 1.3.1.

---
 srcpkgs/gparted/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:

From 771a0f0205e4ff32b82f6d0d15f8e3f7d3067075 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:54:53 +0200
Subject: [PATCH 299/824] openimagedenoise: update to 1.4.1.

---
 srcpkgs/openimagedenoise/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest

From 543c6de08df9b994b6ba0e0f1b32883ced2211b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:01:21 +0300
Subject: [PATCH 300/824] kvantum: update to 0.20.1.

---
 srcpkgs/kvantum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From 4e638ee39bc558222c70a9e0e622fae1c9022f95 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 6 Aug 2021 13:38:14 +0300
Subject: [PATCH 301/824] mesa: add zink gallium driver

---
 srcpkgs/mesa/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8664f4d799bc..68d6a112681e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.1.6
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -152,9 +152,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +163,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 

From 6ad1cc7cc4573ee3fa4e7fc4daff66bffebfc2e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:42:54 +0300
Subject: [PATCH 302/824] qt5ct: update to 1.3.

---
 srcpkgs/qt5ct/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..b0a5d19b3cba 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
+version=1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING

From e19b450ed6284f28385fa302dc1aff450d2fab12 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:03:59 +0200
Subject: [PATCH 303/824] instaloader: update to 4.8.

---
 srcpkgs/instaloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE

From 11dea899f9ae6088ddbe3ee4173b9a79d8abb55f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:29:30 +0200
Subject: [PATCH 304/824] volctl: update to 0.9.0.

---
 srcpkgs/volctl/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code

From fe42ca1f93033d82f64c9b43dd8e75fa3a336ed2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 3 Aug 2021 19:20:34 +0400
Subject: [PATCH 305/824] libcap: update to 2.52.

---
 srcpkgs/libcap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 37b496d7ec804d98c5540f454dff835a774ce72a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:00:00 +1000
Subject: [PATCH 306/824] retroarch: disable gles2 by default, add libusb and
 xdg-utils deps

When both gles2 and opengl options are enabled, RetroArch will only
build with OpenGL ES support. This prevents OpenGL only cores from working.
Disable gles2 by default and use the glcore driver which provides OpenGL 3.2+
and OpenGL ES 3+ support. Fixes: #32246

libusb support is automatic and is currently pulled in when sdl2 is enabled.
Add it to makedepends to ensure it's always enabled.

RetroArch will call xdg-screensaver when it's built with X11 support.
Add xdg-utils to depends when the x11 option is enabled.
---
 srcpkgs/retroarch/template | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 

From c18de35a9a8d939c692e4242ba91791bf39f103f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:52 +0200
Subject: [PATCH 307/824] babashka: update to 0.5.1.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From b9961506beece288ca6f5675cd6f4c0b0e283618 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:56 +0200
Subject: [PATCH 308/824] byacc: update to 20210808.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index db54998f0f25..e987a97cce79 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210802
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
+checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 0d51e41b7f1c55ce97fe152380126e2751038187 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:05:37 +0200
Subject: [PATCH 309/824] nncp: update to 7.6.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 48ae842e0016..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.1
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make

From 2416b39be22b4b5b5a90e841a2e96492f90faecc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:06:38 +0200
Subject: [PATCH 310/824] ugrep: update to 3.3.7.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 2de843eb240abeaeaed8d4b9dee1bd269ad56cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:15:39 +0200
Subject: [PATCH 311/824] amdvlk: update to 2021.Q3.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..e91154da11d4 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.2
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
+_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
+_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
+_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
+ 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
+ 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
+ fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
+ d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From fbf78154deee50d0829738cd82d8a3ad9997a0be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 14:32:17 +0200
Subject: [PATCH 312/824] R-cran-ggplot2: update to 3.3.5.

---
 srcpkgs/R-cran-ggplot2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea

From 24d2d723c0077d762e4652eec5aa4f836452a597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:39:20 +0200
Subject: [PATCH 313/824] fixup! amdvlk: update to 2021.Q3.2.

---
 .../amdvlk/patches/cmake-build-type-none.patch   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt

From b65b51dd60a15f51cd171a9f8f66cdce1a514bfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:43:42 +0200
Subject: [PATCH 314/824] SLADE: update to 3.1.13.

---
 srcpkgs/SLADE/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in

From f7225805af0557bf84fea6dd435b38b2be4e2cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:06 +0200
Subject: [PATCH 315/824] amdvlk: update to 2021.Q3.3.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index e91154da11d4..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.2
+version=2021.Q3.3
 revision=1
-_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
-_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
-_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
-_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
- 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
- 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
- fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
- d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 1b2a2ae6ba3b318d76022694bbe700817e6249cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:39 +0200
Subject: [PATCH 316/824] krita: update to 4.4.7.

---
 common/shlibs                                | 25 --------------------
 srcpkgs/krita/patches/aarch64.patch          | 19 +++++++++++++++
 srcpkgs/krita/patches/cross.patch            | 13 ++++++++++
 srcpkgs/krita/patches/invalid-MimeType.patch | 11 ---------
 srcpkgs/krita/template                       |  4 ++--
 5 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch

diff --git a/common/shlibs b/common/shlibs
index 5affb5dc09fd..278d2456072f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 

From fa9fe89b2de7a3ba9fb65067eb1759e35fc63dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:45:22 +0200
Subject: [PATCH 317/824] pioneer: update to 20210723.

---
 srcpkgs/pioneer/patches/ppc.patch | 6 +++---
 srcpkgs/pioneer/template          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From a55648e8ddba7fc84bf5c5ca4581a8cd7023251d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 9 Aug 2021 13:03:25 +0200
Subject: [PATCH 318/824] homebank: update to 5.5.3.

---
 srcpkgs/homebank/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From f4cf9013dbfc8aa421c80d8fd158dfa42b0df689 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:18:07 +0300
Subject: [PATCH 319/824] wps-office: update to 11.1.0.10702 and adopt.

---
 srcpkgs/wps-office/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 

From 51890b8c8274c24a3ea20979195c565c502214b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 9 Aug 2021 18:51:56 +0200
Subject: [PATCH 320/824] fetchmail: update to 6.4.21.

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 964aadf452d13b74a0def4f81d715f8624ff64ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:44:32 +0200
Subject: [PATCH 321/824] psiconv: remove package

* upstream is dead, distfiles are not available
* depends on libmagick6
---
 srcpkgs/psiconv-devel             |  1 -
 srcpkgs/psiconv/template          | 28 ----------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template

diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 78ba7731cc3e..566536002191 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -229,6 +229,7 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From 70e69e36db44ccb51a052ea982e645f932200694 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jul 2021 10:48:46 +0200
Subject: [PATCH 322/824] meson: update to 0.58.2

---
 .../dont-use-native-pkgconfig-for-gir.patch   | 11 ---
 srcpkgs/meson/patches/fix-unittest.patch      | 77 -------------------
 srcpkgs/meson/template                        |  7 +-
 3 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch

diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 64d4eac7d8844f0979b22d67def3439002a86a91 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 9 Aug 2021 04:03:16 +0300
Subject: [PATCH 323/824] vale: update to 2.10.4.

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE

From 29c2a55ab3ef30e1227ee5cc28d436e31c3f31b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 14:14:18 +0200
Subject: [PATCH 324/824] goxel: update to 0.10.8.

---
 srcpkgs/goxel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From e678e13b22a8e4f87cfda28813f59dcf35f26492 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 15:02:41 +0200
Subject: [PATCH 325/824] clazy: update to 1.10.

---
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ++++++++++++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 -----
 srcpkgs/clazy/template                        |  11 +-
 3 files changed, 370 insertions(+), 93 deletions(-)
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch

diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d

From 059324779c25ea6f62977e05afc78a9d18f3dead Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 20:13:14 +0200
Subject: [PATCH 326/824] lagrange: update to 1.6.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..15992e57dbaa 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
 
 post_install() {
 	vlicense LICENSE.md

From 85eb810b4e4220961578d50a164982bc8efd85e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:06 +0200
Subject: [PATCH 327/824] knewstuff: add missing dependencies

closes #703
---
 srcpkgs/knewstuff/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..156fa1a0102b 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,11 +1,12 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
 version=5.84.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"

From a5659dc1dae87705a33c07b4a818e470fecf9f55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:47 +0200
Subject: [PATCH 328/824] yakuake: add missing dependency

---
 srcpkgs/yakuake/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..61d6e2e645c4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,11 @@
 # Template file for 'yakuake'
 pkgname=yakuake
 version=21.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"

From cf9cf9fde9d266dfe6b57e56cf703e2b86fa7b37 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Sun, 8 Aug 2021 00:27:14 +0700
Subject: [PATCH 329/824] ibus-bamboo: update to 0.7.8.

---
 srcpkgs/ibus-bamboo/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }

From ece36fae0a89a95ee29aacf0b268326fb5eeb86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 10 Aug 2021 15:09:36 +0700
Subject: [PATCH 330/824] cozy: fix cross build with meson 0.57+

While we're at it, drop unnecessary makedepends, this is a python only
package after all.
---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 652ed886f3a9..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -4,9 +4,9 @@ version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"

From 198cf452e93c9ac32678f5b8c1e4e12ed9f0a30b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 10 Aug 2021 12:48:00 +0200
Subject: [PATCH 331/824] linux5.13: update to 5.13.9.

Set CONFIG_PTP_1588_CLOCK_KVM=m to remove a boot warning on non-VM boots.

Set CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y.
Set CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m, CONFIG_SND_SOC_RT1308=m.

Closes #30508.
---
 srcpkgs/linux5.13/files/i386-dotconfig   | 24 ++++++++++----------
 srcpkgs/linux5.13/files/x86_64-dotconfig | 28 +++++++++++++-----------
 srcpkgs/linux5.13/template               |  4 ++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 43a3f6aa16a6..2c8c80b9945f 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.8
+version=5.13.9
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
+ 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b192a5e1e80fb7a35646363d2167369a604f472f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 08:27:36 -0300
Subject: [PATCH 332/824] c-ares: update to 1.17.2.

Fixes CVE-2021-3672.

Also fix tests (locally).
---
 srcpkgs/c-ares/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}

From 9d636d3bdacef27bf4bc3352daddaa5921565b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 10:09:34 +0200
Subject: [PATCH 333/824] crispy-doom: update to 5.10.2.

---
 srcpkgs/crispy-doom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 

From 3ca5820a1f9503692d6da3b0ab4eb70f7f68e7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 09:53:42 +0200
Subject: [PATCH 334/824] doctl: update to 1.63.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0

From fb3eaae48b27fe37f0fe81748e9950f2a5c4133b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 10:34:01 +0300
Subject: [PATCH 335/824] thefuck: update to 3.31.

---
 srcpkgs/thefuck/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {

From 44b44c1260ddb2a8fd42bb65e51b64ab5b8cc8c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 16:46:29 +0200
Subject: [PATCH 336/824] piper: update to 0.6.

---
 srcpkgs/piper/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi

From c2adb8240dcf3a7d38c265547b8de8d1f933dca2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:32:15 +0200
Subject: [PATCH 337/824] sfeed: update to 1.0.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 9f3d23098319..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.25
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE

From 19a3a55a4ee766e354d78fe270370763a5f02db3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:33:47 +0200
Subject: [PATCH 338/824] sfeed_curses: update to 1.0.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 148f3d67f824..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.13
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE

From 80ad1eb9a9b0f136037f57fab3abaf252ae8826e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:10:39 +0300
Subject: [PATCH 339/824] broot: update to 1.6.3.

---
 srcpkgs/broot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 542bc12852bc2e685596366aa28d529136b45cbe Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 13:46:14 +0200
Subject: [PATCH 340/824] micro: update to 2.0.10.

---
 srcpkgs/micro/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE

From 9a4e0b2c077041b6865a46f926000563375d8653 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 14:06:21 +0200
Subject: [PATCH 341/824] swaybg: update to 1.1.

---
 srcpkgs/swaybg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE

From 363e3df9d25e428cfeed233d22cc25ff63fe09d7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH 342/824] haproxy: enable hitless reloads

Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
 srcpkgs/haproxy/files/haproxy.cfg | 1 +
 srcpkgs/haproxy/files/haproxy/run | 2 +-
 srcpkgs/haproxy/template          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"

From 1448a24c03f63520f91aa82dfed4b44feeb8e9d0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 17 Jun 2021 11:06:52 +0200
Subject: [PATCH 343/824] noise-repellent: update to 0.1.5.

Add patch made by ericonr to fix cross compilation.
---
 .../noise-repellent/patches/fix-cross.patch   | 28 +++++++++++++++++++
 srcpkgs/noise-repellent/template              |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch

diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae

From a63e1b5601bdaf49d1094ca06a916cb5590d8cf3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:40:12 +0200
Subject: [PATCH 344/824] New package: libgnt-2.14.2.

---
 srcpkgs/libgnt                        |   1 -
 srcpkgs/libgnt-devel                  |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff | 130 ++++++++++++++++++++++++++
 srcpkgs/libgnt/template               |  31 ++++++
 4 files changed, 162 insertions(+), 2 deletions(-)
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template

diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}

From a46ad8173733f1fc982b65ae69149047aa7f3336 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:42:14 +0200
Subject: [PATCH 345/824] pidgin: update to 2.14.6.

---
 .../patches/01-configure_ac-libnm_pc.patch    | 11 -------
 .../patches/02-libpurple-nm_state.patch       | 19 ------------
 srcpkgs/pidgin/template                       | 30 +++++--------------
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch

diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {

From cdd0a7812b02fe9f8f15d65a9ab6bb36d333957e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 10 Aug 2021 19:00:57 +0200
Subject: [PATCH 346/824] ugdb: fix build on platforms without 64-bit atomics

---
 srcpkgs/ugdb/patches/atomicu64.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch

diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 

From 62b997a8fac0610c66bf507a148b4f0efc920967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 14:10:41 -0300
Subject: [PATCH 347/824] srcpkgs/: touch new packages for the builders.

aarch64* repos are missing some.
---
 srcpkgs/libadwaita/template                | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index cb23b656c004..6b49f233b3ec 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -3,7 +3,7 @@ pkgname=libadwaita
 version=1.0.0alpha2
 revision=1
 _ver=1.0.0-alpha.2
-wrksrc="$pkgname-$_ver"
+wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d866ff71c6df..12afe88ffe07 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-httpserver
 version=1.0.1
 revision=1
-wrksrc="pytest-httpserver-${version}"
+wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pytest python3-Werkzeug"

From 85e2bc28355f72f6da09422c0ea6fdd58175018e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 10 Aug 2021 17:59:01 +0200
Subject: [PATCH 348/824] cmus: orphan

---
 srcpkgs/cmus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"

From 9f1d20273ce9280b4c140a59edfc1eb6d6c64658 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Tue, 10 Aug 2021 10:21:49 -0400
Subject: [PATCH 349/824] synapse: update to 1.40.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index b45f32817bdf..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.39.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 30110eddaae5244ce00de41955b250d8bc7fc3b2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 20:01:53 +0300
Subject: [PATCH 350/824] fstrm: update to 0.6.1.

---
 srcpkgs/fstrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi

From 9748f7ffb8d320d2280cbaae3fc72851c5d3b8f6 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:04:00 +1000
Subject: [PATCH 351/824] xdg-utils: xdg-screensaver needs xset

---
 srcpkgs/xdg-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 

From 945c22b1cdb9b9089d354718985be824a213d7b3 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sat, 31 Jul 2021 09:26:45 -0400
Subject: [PATCH 352/824] dolphin-emu: update to 5.0.14790.

---
 .../dolphin-emu/patches/VkDeviceMemory.patch  | 37 -------------------
 srcpkgs/dolphin-emu/template                  | 20 +++++++---
 2 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch

diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }

From 6de2a07f31c5369e0e4100e6c1f5a76301278796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Tue, 10 Aug 2021 00:19:56 +0200
Subject: [PATCH 353/824] New package: alsa_rnnoise-1.0_1

Closes #29409
---
 srcpkgs/alsa_rnnoise/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/alsa_rnnoise/template

diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d

From 6f7803b354462ce3cbb5e415bd09b90b46295160 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 10 Aug 2021 19:23:15 +0100
Subject: [PATCH 354/824] font-iosevka: update to 9.0.1.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..1388c2af3ccd 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=9.0.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
+be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
 
 font_dirs="/usr/share/fonts/TTF"
 

From ccc4697d30902ecaf5bf56f12066e5d0cd05fd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 31 Jul 2021 15:22:09 +0200
Subject: [PATCH 355/824] podman: update to 3.2.3.

By ericonr:
- remove INSTALL.msg, it's been 4 months since the change
- add changelog
---
 srcpkgs/podman/INSTALL.msg | 15 ---------------
 srcpkgs/podman/template    |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/podman/INSTALL.msg

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 73c0bab64683373e3d3f438d4ce8e940740a9cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:51:28 -0300
Subject: [PATCH 356/824] rustup: remove INSTALL.msg.

Anyone who finds the file under /usr/share/doc will be using
`xbps-query -f` to list package contents, so they might just as well see
the only executable in the package.
---
 srcpkgs/rustup/INSTALL.msg | 1 -
 srcpkgs/rustup/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/rustup/INSTALL.msg

diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo

From 0b53153930f2477b35b46cfe897985820215bdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:54:06 -0300
Subject: [PATCH 357/824] qt5ct: remove INSTALL.msg.

---
 srcpkgs/qt5ct/INSTALL.msg | 1 -
 srcpkgs/qt5ct/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg

diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index b0a5d19b3cba..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
 version=1.3
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"

From 45d9a736def438e1c3a4df6cd910bc23155807b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:55:12 -0300
Subject: [PATCH 358/824] git-lfs: remove INSTALL.msg.

Man page shows installation in EXAMPLES.
---
 srcpkgs/git-lfs/INSTALL.msg | 1 -
 srcpkgs/git-lfs/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg

diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"

From a47050cf5236b5afa259f01d849aba0ffe666cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:52:24 -0300
Subject: [PATCH 359/824] python3-docutils: update to 0.17.1, remove
 python-docutils.

---
 .../python-docutils/patches/test-import.patch | 20 ------
 srcpkgs/python-docutils/template              | 62 -------------------
 srcpkgs/python3-docutils                      |  1 -
 srcpkgs/python3-docutils/template             | 39 ++++++++++++
 4 files changed, 39 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template

diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}

From 9b375e93d2825cb51f815b1529d259d1a3851909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:53:05 -0300
Subject: [PATCH 360/824] removed-packages: add python-docutils.

We ship only python3-docutils now.
---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 566536002191..fa919b6de59b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=47
+revision=48
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -234,6 +234,7 @@ replaces="
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2

From be6fb51739582fb4c7c9ae26dca67b0f1cb192da Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 Aug 2021 16:21:28 -0500
Subject: [PATCH 361/824] nvidia: update to 470.63.01.

---
 srcpkgs/nvidia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 9c022ef65649..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
-revision=2
+version=470.63.01
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From d4e3808492af189cfd3cdc8feb391d82e3404151 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 21:44:56 +0200
Subject: [PATCH 362/824] catgirl: update to 1.9.

---
 srcpkgs/catgirl/patches/add-missing-include.patch | 10 ++++++++++
 srcpkgs/catgirl/template                          |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch

diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0

From 3ab746854933a2671846174e84766551221c13d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Jul 2021 01:38:42 -0300
Subject: [PATCH 363/824] rpi-kernel: update to 5.10.52.

- document how we pick the commit to be used
- fix header installations so dkms works; based on fixes to mainline
  kernel packages

In this update, we are using the commit from
https://github.com/raspberrypi/linux/releases/tag/1.20210727
---
 srcpkgs/rpi-kernel/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 22d1ed37eec412d993c0b277d03883beb9925d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:39 -0300
Subject: [PATCH 364/824] rpi2-kernel: update to 5.10.52.

---
 srcpkgs/rpi2-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 3ffa6f39e98524d239d3a72cdf8253564841873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:20 -0300
Subject: [PATCH 365/824] rpi3-kernel: update to 5.10.52.

---
 srcpkgs/rpi3-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 4e4438ced96be85040889ea196bb595b92e6ab89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 4 Aug 2021 10:18:40 -0400
Subject: [PATCH 366/824] rpi4-kernel: update to 5.10.52.

---
 srcpkgs/rpi4-kernel/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From af72e1411e0531881f1fbd264046aebecfe01a52 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 21:39:19 -0500
Subject: [PATCH 367/824] nomad: update to 1.1.3

---
 srcpkgs/nomad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;

From 3b360a4e225ddc73e4ebe9b7682c552500bb73f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:50 -0300
Subject: [PATCH 368/824] mdBook: update to 0.4.12.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 49e3264c70be..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.11
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE

From e7f4dfff3fb0118ec541ebecbc382bbc31e896da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:53 -0300
Subject: [PATCH 369/824] qbittorrent: update to 4.3.7.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}

From 070e756a6c39bc6684a78f8bb4a6f4e898918950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:58:40 -0300
Subject: [PATCH 370/824] gzdoom: update to 4.6.1.

---
 srcpkgs/gzdoom/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes

From 9d489ec884d0968aadfc31cb59ac6c2cd7eb102d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH 371/824] octave: update to 6.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
  packages easier was considered, but ultimately dismissed; since they
  aren't enough to actually build packages, they would increase
  dependency count for little gain

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
---
 srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From 644a89d95b2775b849d841fd28589a088ed66f2d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:05:48 -0500
Subject: [PATCH 372/824] consul: update to 1.10.1.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE

From 21c7385bb2a3d3bf67778a6ea24b13f1805ae881 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:13:16 -0500
Subject: [PATCH 373/824] vault: update to 1.8.1.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"

From 92fe487114f817f1ea886f8969bf0d7418794c93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 14:30:04 +0200
Subject: [PATCH 374/824] iputils: update to 20210722.

---
 srcpkgs/iputils/template | 6 +++---
 srcpkgs/iputils/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/iputils/update

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'

From 401bbbd49e3512d3e4d53b6c65dca20809eba463 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:13:05 +0200
Subject: [PATCH 375/824] byacc: fix checksum

---
 srcpkgs/byacc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index e987a97cce79..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From c58ed63a78d096074a14f9dd269d3e7b3065c0ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:10:40 +0200
Subject: [PATCH 376/824] icu: update to 69.1.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..8d1e95f063ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..a05d0a7d35a8 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,20 +2,21 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
-revision=2
+version=69.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"

From c4549d5fd5dca78f3c062cdea21cd31bdec3e924 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 377/824] OpenRCT2: rebuild for icu-69.1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 761da7f1e580..8eeb3f75b528 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
 version=0.3.4.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 8c385227b7d03b901e35849931fc87fb01be0235 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 378/824] R: rebuild for icu-69.1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 560545bf26b57e43795d8391010c0f9cf9e0a06b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 379/824] an: rebuild for icu-69.1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 57b0ea1b1beaf1f9abdac1714929173622368f3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 380/824] boost: rebuild for icu-69.1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From 5600ed3a509752c2eb77000b0573d0964b379b5a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 381/824] brltty: rebuild for icu-69.1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From 40b52420b872910a9e31a4452fcabf9c084d76d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 382/824] calibre: rebuild for icu-69.1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From f6939f9ef490e2f94e478db63c12ea4310319d37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 383/824] clamav: rebuild for icu-69.1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From af05df86a979735e827307592b4785e45a887ba9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 384/824] darktable: rebuild for icu-69.1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 7c694d6277f3bf1167c0c9803e32707756ef2566 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 385/824] dino: rebuild for icu-69.1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From 62e9b8bd48c7df10718ef65e1ab63d969540027d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 386/824] dwdiff: rebuild for icu-69.1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From 1a26307d900d57ce2630bc74d4dc6050a9f86295 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 387/824] enchant2: rebuild for icu-69.1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..59413b958747 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;

From 1ee96f8e5cec8e7aefbbf23bc91829de656ce487 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 388/824] evolution-data-server: rebuild for icu-69.1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF

From 44060d639dba1d3dec0c90cc8b0bc759a2107788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 389/824] firefox: update to 91.0, rebuild for icu-69.1

---
 srcpkgs/firefox/patches/lto-thin.patch | 19 +++++++++++++++++++
 srcpkgs/firefox/template               |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 08c8efadf2d9..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 

From 687a9ff5333e50f957ce7e66a9d199e148caefd2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 390/824] firefox-esr: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 

From 7443a6acf71c9087c5f21d620580d26e4591d3f5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 391/824] freshplayerplugin: rebuild for icu-69.1

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 14bc44f343cc6c2e5fc64165542871fe10e6ad8d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 392/824] geary: rebuild for icu-69.1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 3891e7190112..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From a8db0d519894f75d3e2a8227f92d25a539fe5adf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 393/824] gnucash: rebuild for icu-69.1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From be23e25c8c7e59a29eb6544fa1e51050e0c89017 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 394/824] gnustep-base: rebuild for icu-69.1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 80f2e43f8255928643169197b9fdf7b284ab9005 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 395/824] gnustep-gui: rebuild for icu-69.1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From ecc8ba93cdaa88330e6d1320ec734fc51f21c0a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 396/824] harfbuzz: rebuild for icu-69.1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 106a44ff3139..6964948610fa 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=2.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From 8c788e2e7e4911c5a67a9d979989a1f72fc313a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 397/824] icu4lua: rebuild for icu-69.1

---
 srcpkgs/icu4lua/patches/icu-68.patch | 94 ++++++++++++++++++++++++++++
 srcpkgs/icu4lua/template             |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch

diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From ca6f50d6295beb8b1ab34b8c94f94b7e7d6f8d05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 398/824] imv: rebuild for icu-69.1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 608cc8790641..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel

From eafc433260925863d115c5458f6f9f85f922ae0c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 399/824] kdb: rebuild for icu-69.1

---
 srcpkgs/kdb/patches/kdb-fix-build.patch    | 67 ++++++++++++++++++++++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch | 33 +++++++++++
 srcpkgs/kdb/template                       |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch

diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From c791aa5a9da9a9cf6d02ee2a16ae97e51e639f0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 400/824] kiwix-lib: rebuild for icu-69.1

---
 srcpkgs/kiwix-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then

From 72da42678cbf642df5c88032697bff184cbbcaed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 401/824] libbitcoin-blockchain: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-blockchain/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From b8653dde3b601f755def2f9833a3f5d6844be28d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 402/824] libbitcoin-client: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"

From 37cf88d14901a8dfbed00cec9f6b0b3d4f85c9a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 403/824] libbitcoin-database: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-database/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 00387d8218cfd2802b1e569125687ea8f7eeedd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 404/824] libbitcoin-explorer: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-explorer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 8ef76648c9f8af99642f6bb85c4374625979de98 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 405/824] libbitcoin-network: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-network/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 14328fc0c5e7951cc790271663dbf0f6c02a4776 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 406/824] libbitcoin-node: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-node/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From e7dfdaf30dfb63f0c2bc65ad7969cc6fb2d500e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 407/824] libbitcoin-protocol: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-protocol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 0376fc4f6f0582e5c81ca2591c4e0839f94704d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 408/824] libbitcoin-server: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 7cf55657419eef3fceb69a03304f9f7ab5525b8f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 409/824] libbitcoin-system: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png

From 27a641f1ee42fb466f0f6ab5cca091ff86d12120 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 410/824] libcdr: rebuild for icu-69.1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 2961ee0600e0d074b9fff9b2a7bf32ccbbac516a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 411/824] libe-book: rebuild for icu-69.1

---
 srcpkgs/libe-book/patches/icu-68.patch | 20 ++++++++++++++++++++
 srcpkgs/libe-book/template             |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch

diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From eaeb78bd3853c49cede9fcf2186c04aac98a32cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 412/824] libgdal: rebuild for icu-69.1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From e1442521f03b8862cc3f8515f5aa857d8ca65bc1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 413/824] libical: update to 3.0.10, rebuild for icu-69.1

---
 srcpkgs/libical/patches/fix-cross.patch | 58 +++++++++++++++++++------
 srcpkgs/libical/template                |  7 ++-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"

From 5c7b1a847913e847d2bfaeca37360651a3cca821 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 414/824] liblcf: rebuild for icu-69.1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 3c5670777aa429af95ab04d53dbf0e81159a7b05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 415/824] libmspub: rebuild for icu-69.1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From 0a42637e8f5bd39f3d9ec751eb6468d60f64f229 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 416/824] libpsl: rebuild for icu-69.1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From f565756f1baff450fe9a9f11e18b7cd6cb846477 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 417/824] libqxp: rebuild for icu-69.1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From f103f06410f027709aff6e903b9ceaf0b9a7b7ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 418/824] libreoffice: rebuild for icu-69.1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 334026e6ecce8f1533e0222b01127eb4b668b371 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 419/824] libvisio: rebuild for icu-69.1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From bc867cd8d3ded35cfa1ac194f301b2fb2a6f8307 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 420/824] libxml2: rebuild for icu-69.1

---
 srcpkgs/libxml2/patches/icu-68.patch | 25 +++++++++++++++++++++++++
 srcpkgs/libxml2/template             |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch

diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From 9c4fdbac3b4e2430aec081051a82eb5e0b2ff167 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 421/824] libzim: rebuild for icu-69.1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 3b0c4fc3d3737b540f71d19f9788a3d1161ea10f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 422/824] maim: rebuild for icu-69.1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 2f221605158eb2704bb3f944009f4dea92172da5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 423/824] modsecurity: rebuild for icu-69.1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From 114e04702a3a9dc8c5932e54b9798e76287f1790 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 424/824] mozjs78: rebuild for icu-69.1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 8e4ce04fde983b40c5b0957808daf53bc67c2e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 425/824] ncmpcpp: rebuild for icu-69.1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From b6fa357254b17c3156575b83246f158f5c9eff52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 426/824] nodejs: rebuild for icu-69.1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From 71ecb42ee2265131b10f645392180e39984e1acf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 427/824] nodejs-lts: update to 12.22.4, rebuild for icu-69.1

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 10fc60699a24834c5f076c5f4fe69880e5e30c60 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 428/824] nodejs-lts-10: remove

---
 srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ---
 srcpkgs/nodejs-lts-10/patches/ppc32.patch   | 29 -------
 srcpkgs/nodejs-lts-10/patches/ppc64.patch   | 41 ---------
 srcpkgs/nodejs-lts-10/template              | 96 ---------------------
 srcpkgs/nodejs-lts-10/update                |  2 -
 5 files changed, 182 deletions(-)
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update

diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"

From d737aa0e965236395e114ee623bf623bf368fa19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 429/824] nuspell: rebuild for icu-69.1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From c6bb1bd924b1d161e18036e83294ae00b5313e99 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 430/824] openttd: rebuild for icu-69.1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes

From 7f6bc9d74004a013a9b2d48d52e3ac1a7a79bfa9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 431/824] peaclock: rebuild for icu-69.1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From 5d7fe94a63716944c081cfff6694e6501c4df408 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 432/824] perl-XML-LibXML: rebuild for icu-69.1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From 0c5b8a3423c6de345bba7ca680d1513bf1742891 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 433/824] php: rebuild for icu-69.1

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From f5882a3c7deba70adeb1a6b13594a655bcc72a94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 434/824] poedit: rebuild for icu-69.1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From a573fba5f9fcd1d4f658e4a0620cb4633c3cf2a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 435/824] postfix: rebuild for icu-69.1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4dc1b9e5dad8..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.6.2
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From f71297c131d9b8ff0a8543487693b3f5607bf683 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 436/824] python3-PyICU: rebuild for icu-69.1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a8c8c6d8ef5f4f7fbefc73d626868c45cdb0745e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 437/824] qalculate: rebuild for icu-69.1

---
 srcpkgs/qalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 4d9e490bf26d..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
 # and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From 2cf41bac040232044e282e42f10fc05e396dabdf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 438/824] qt5: rebuild for icu-69.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..ca47cb6952b4 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From 3e433c36917d2a0c4ed541b45f473475ba584174 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 439/824] qt5-webkit: rebuild for icu-69.1

---
 srcpkgs/qt5-webkit/patches/glib-2.68.patch |  26 ++++
 srcpkgs/qt5-webkit/patches/icu-68.patch    | 170 +++++++++++++++++++++
 srcpkgs/qt5-webkit/template                |   2 +-
 3 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch

diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

From d39f5d1389c1539ce19b250a4ed1cbd29e1836d3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 440/824] qt6-base: rebuild for icu-69.1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..d877eeb9b3a3 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6

From dc2ef100defcd309348c82fee296248d4fe644ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 441/824] qt6-qt5compat: rebuild for icu-69.1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "

From d7fb395c5e12831b060791b3a465bba77db2722b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 442/824] rspamd: rebuild for icu-69.1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From fb46418936e99d26a8bde242c842d19ac7273134 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 443/824] scribus: rebuild for icu-69.1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 359f27369af0bb32103e8bb4aa75be42c3b0a8a2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 444/824] sile: rebuild for icu-69.1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From 81a3f973d659bd719d91d8bd3ac1e85c019307d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 445/824] slop: rebuild for icu-69.1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From 23fabac1665d34b64811f890014c20547fecb969 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 446/824] sword: rebuild for icu-69.1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From a643d91d25cedb91da045ec523264484d413bba5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 447/824] tectonic: rebuild for icu-69.1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"

From 20722439975192b7c79d5800c8ae214a508d4cc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 448/824] tepl: rebuild for icu-69.1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"

From df53563d80e22647834579c0fe8665543ef8dfc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 449/824] tesseract-ocr: rebuild for icu-69.1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From a0776bc2c66d1cd5007dfda5bea7ac98b064c959 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 450/824] texlive: rebuild for icu-69.1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From db6239236042ad43e262f0ea277344035ddf1b78 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 451/824] thunderbird: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 

From 6c6206d0c86c944def8cc0b12a3a2e5ddfffc7c2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 452/824] tracker: rebuild for icu-69.1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From 1e7fc3fef814e42892579089f1cfa41333bf9cb1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 453/824] tracker-miners: rebuild for icu-69.1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 4531b1f9cdd97a7560e369ffbd145537fcede803 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 454/824] tracker3: rebuild for icu-69.1

---
 srcpkgs/tracker3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"

From be49e823d8a6e919b332f5aba5cf2093c0bf9b3d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 455/824] tracker3-miners: rebuild for icu-69.1

---
 srcpkgs/tracker3-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss

From 05537c8cf4ca987406aa7b25fddd36a003921370 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 456/824] unar: rebuild for icu-69.1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 542c6c75608d3ded60bb356726f5eb8b2078c788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 457/824] vte3: rebuild for icu-69.1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From 3f3897bc64ecfe902f0fa26ef702d9cdec119768 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 458/824] webkit2gtk: rebuild for icu-69.1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..bbe0d8ddca86 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From 44eedad7ebf46367d6542370b91557ba31b6e396 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 459/824] widelands: rebuild for icu-69.1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include

From 1f23a81c439d175654ee3483062a959129161dc9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 460/824] xerces-c: rebuild for icu-69.1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From fd491ddc30c15adc36b72f9a9616074fe70f0a7f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 461/824] yaz: rebuild for icu-69.1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From 35cec78e3b710031c4b1de1c4f1b3aa81270cd13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 462/824] znc: rebuild for icu-69.1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python

From 0526ac42096ee6cb8ea4dfbdef79e79f22a4306f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:57:08 +0200
Subject: [PATCH 463/824] removed-packages: drop nodejs-lts-10

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fa919b6de59b..cf88a864cba9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,7 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 9678af1819608e07fd0aaa6569921218f5ad2eaa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 15:01:15 +0200
Subject: [PATCH 464/824] rstudio: switch nodejs-lts

---
 srcpkgs/rstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel

From 139e78849548a200dddb797b7f23f2d1b95df443 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:08:27 +0200
Subject: [PATCH 465/824] firefox-esr-i18n: update to 78.13.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"

From ee71be1b59bb2fffafd61635e36c2725e2c384c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 466/824] qt5-webengine: update to 5.15.5, rebuild for icu-69.1

---
 .../patches/0120-QTBUG-91773.patch            | 372 ------------------
 .../0200-invalidate-old-v8-cache.patch        |  31 --
 srcpkgs/qt5-webengine/template                |  16 +-
 3 files changed, 9 insertions(+), 410 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch

diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"

From 536a35621a2e1ba51862ebc5f9f81a54e48f28f3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:51:45 +0200
Subject: [PATCH 467/824] firefox-i18n: update to 91.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 755b02d248c0..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0.1
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
- 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
- a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
- 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
- ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
- 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
- d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
- ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
- 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
- ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
- 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
- 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
- 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
- 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
- bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
- 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
- e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
- cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
- 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
- df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
- 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
- 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
- cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
- dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
- 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
- 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
- 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
- c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
- b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
- 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
- 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
- b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
- 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
- e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
- 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
- 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
- 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
- e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
- 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
- befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
- e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
- 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
- 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
- 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
- ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
- d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
- f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
- 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
- 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
- db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
- a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
- d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
- fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
- c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
- a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
- a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
- c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
- b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
- 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
- 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
- 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
- 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
- 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
- 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
- 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
- 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
- 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
- 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
- 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
- a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
- b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
- 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
- a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
- a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
- cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
- dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
- 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
- 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
- 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
- b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
- 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
- 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
- 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
- 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
- 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
- c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
- f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
- e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
- e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
- 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
- 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
- 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
- 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
- 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
- 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
- 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"

From c5b64c645023d56873c2aba234f5c86756dd9bce Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 468/824] 0ad: patch spidermonkey 78.6 for rust>=1.50, rebuild
 for icu-69.1.

Necessary in order to rebuild 0ad for libfmt.so.8.
---
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 ++++++++++++++++++
 srcpkgs/0ad/template                          |   2 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
new file mode 100644
index 000000000000..95007b32f25e
--- /dev/null
+++ b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
@@ -0,0 +1,107 @@
+From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
+From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 27 Feb 2021 09:31:17 +0000
+Subject: [PATCH] Patch SM78.6 for Rust 1.50
+
+Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
+(this fix is integrated in SM78.8)
+
+Reviewed By: s0600204
+
+Differential Revision: https://code.wildfiregames.com/D3590
+
+
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
+---
+ libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
+ libraries/source/spidermonkey/patch.sh        |  4 ++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 libraries/source/spidermonkey/FixRust150.diff
+
+diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
+new file mode 100644
+index 00000000000..cfb0d58b4a0
+--- /dev/null
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
+index 58be1fbdef0..879964b0f2e 100644
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..f6e6b41899de 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 2e3294fbfd45717df6e5436631be431e3c6451a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:08:09 -0300
Subject: [PATCH 469/824] R-cran-stringi: update to 1.7.3, rebuild for icu-69.1

---
 srcpkgs/R-cran-stringi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE

From e88802f7a1571c6a51a8005d5ecb70669dc40c59 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 Aug 2021 15:12:39 +0200
Subject: [PATCH 470/824] thunderbird-i18n: update to 78.13.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"

From a51ce0bff41274f7fffb76220be57c9428ff13d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 11:27:22 -0300
Subject: [PATCH 471/824] qt6-base: only add self to hostmakedepends for cross

Tools other than xbps-src might get confused and assume a build cycle,
even if xbps-src can deal with it.
---
 srcpkgs/qt6-base/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d877eeb9b3a3..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"

From e2708fbc0f6359cbf5737e76dfcade5360e4f84a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:36:26 +0200
Subject: [PATCH 472/824] nodejs-lts-10: remove stale symlink

---
 srcpkgs/nodejs-lts-10-devel | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/nodejs-lts-10-devel

diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file

From 4ccd4d2cb36fdb1051e85f411d1c5082c4bfb4aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:04:04 +0200
Subject: [PATCH 473/824] ripright: build with imagemagick7

---
 srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++
 srcpkgs/ripright/template                   | 14 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch

diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}

From f4f9230d80702d859c23254fea4e11d18b6985ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 22:05:44 +0200
Subject: [PATCH 474/824] New package: hello-2.10

---
 srcpkgs/hello/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/hello/template

diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b

From fd722dcdfdec5ece8560194886429fe0ba5568af Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Thu, 15 Apr 2021 21:30:58 -0400
Subject: [PATCH 475/824] nginx: configure with dynamic module support

---
 srcpkgs/nginx/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \

From 601649d05d5103cf63a56742bcbbb95efa0c506b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:18:27 +0300
Subject: [PATCH 476/824] spdx-licenses-list: update to 3.14.

Also fix license (thanks @paper42).
---
 common/travis/license.lst           | 14 ++++++++++++++
 srcpkgs/spdx-licenses-list/template |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx

From 50179be2dc1e9ee25bab01a57410b1e8898d5951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 477/824] New package: CUnit-2.1.3

---
 srcpkgs/CUnit-devel    |  1 +
 srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/CUnit/update   |  1 +
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update

diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'

From e3682033ec656e30f2cb1390b9d9c512c374a718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 478/824] postgis: update to 3.1.3, enable unit tests

---
 srcpkgs/postgis/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From ec1db23bdbd1d066e41e328454479aa5da997f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 479/824] postgis-postgresql12: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql12/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 15c007f9c99f56dadff9dbb6bc84d564950f221a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 480/824] postgis-postgresql13: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql13/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From b4f079cd60829e745888784e02c242deff8059bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 481/824] mosquitto: enable tests

---
 srcpkgs/mosquitto/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }

From 8db1ca112ad9ee9177a714d59fc2c879af0b0c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 Aug 2021 20:46:25 +0200
Subject: [PATCH 482/824] README.md: put chroot style information together,
 extend

---
 README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 

From d030b0e220630fa68da90f67878bc01b813455ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 11 Aug 2021 14:33:40 +0200
Subject: [PATCH 483/824] intellij-idea-ultimate-edition: update to 2021.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)

From 5a25fe84db5f0bbbf2c5915ae76d9c3a1a52abe4 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 12 Aug 2021 00:12:28 +0100
Subject: [PATCH 484/824] chezmoi: update to 2.1.5.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE

From d10d5af1bdd8775b25d369b70f51a6e56abf64d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 485/824] qt5: add libxml2-devel to makedepends

Trying to reorder cross-build.
Transitively dependencies via libxslt-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ca47cb6952b4..935a156b7d48 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel

From f8f90ca8d05ba3a914de0fb96acdcd4ec23b64e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 486/824] qt5: add libxml2-devel to hostmakedepends

Trying to reorder cross-build.
Transitively dependencies via wayland-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 935a156b7d48..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 

From 6b5a98bca31cfae98bb5cc99e0820b18b58d96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:16:15 +0700
Subject: [PATCH 487/824] harfbuzz: makedepends+=libxml2

Force builder to use staging libxml2
---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 6964948610fa..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -7,7 +7,7 @@ build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"

From b76f5bef8c7df303e8d20b67a209e65ce4a33ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:24:31 +0700
Subject: [PATCH 488/824] webkit2gtk: hostmakedepends+=libxml2-devel

See previous commit.
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index bbe0d8ddca86..951c1c9ee5ee 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From 3c9f521c95bbe9dff92dbeba71413d5fc7ab920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:31:19 +0700
Subject: [PATCH 489/824] webkit2gtk: hostmakedepend+=libpsl

Force libpsl from staging, (geoclue2->libsoup-gnome->libsoup->libpsl)
---
 srcpkgs/webkit2gtk/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 951c1c9ee5ee..837fd8130803 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From fa7e812d6f7dcbbd405ead900b878eabf5c90fc7 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Wed, 11 Aug 2021 23:11:31 -0300
Subject: [PATCH 490/824] icewm: update to 2.7.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 

From ea67c70c19c319611de0a7af1ddce7691b02964d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:17:08 +0400
Subject: [PATCH 491/824] osinfo-db: update to 20210809.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From ad4b4b362ecae61007d6258da79e0a918995fa6c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:25:10 +0400
Subject: [PATCH 492/824] benchmark: update to 1.5.6.

---
 srcpkgs/benchmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e45c13ae7ec955da50eb01a223661555ed968f28 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:11:39 +0400
Subject: [PATCH 493/824] python3-regex: update to 2021.8.3.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 83f291af2d03439cda2818210bf961d1f29769a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:03:54 +0300
Subject: [PATCH 494/824] skype: update to 8.75.0.140.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index d8e2f3a77606..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.74.0.152
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 

From 33f01abd29e96c0fa6c4cb481016bde8f5ea1651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 22:46:55 -0300
Subject: [PATCH 495/824] ptii: remove package.

Distfiles were never available officially. The git repo in [1] still
works, but seems inactive, and the homepage no longer works.

[1] git://z3bra.org/ptii
---
 srcpkgs/ptii/patches/fix-installpaths.patch | 15 ---------------
 srcpkgs/ptii/template                       | 14 --------------
 srcpkgs/removed-packages/template           |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template

diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cf88a864cba9..c9349197c278 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -230,6 +230,7 @@ replaces="
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
  psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From cd7fd20f07f9a0632bf93e34ed6e517d99d47fa9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 09:45:43 +0300
Subject: [PATCH 496/824] protontricks: update to 1.6.0.

---
 srcpkgs/protontricks/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}

From bbf15689d99be25b5d9609ad095c2b7199cd39f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 9 Aug 2021 20:28:29 +0200
Subject: [PATCH 497/824] libfilezilla: update to 0.31.1.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8d1e95f063ec..f96d3f36b3ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2588,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 290f5d1501b8c0881e2a36cc78f0c028626cb8d2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 16:29:47 +0200
Subject: [PATCH 498/824] filezilla: update to 3.55.1.

---
 srcpkgs/filezilla/patches/libtool_tag.patch | 11 -----------
 srcpkgs/filezilla/template                  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch

diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d4014c75337f83717f2fe87797b14b7d82955f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 21:32:12 +0700
Subject: [PATCH 499/824] OpenRCT2: makedepends+=libxml2-devel

Transitive via SDL2-devel -> wayland-devel
---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 8eeb3f75b528..1f4738bdc46a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"

From a1eb1dbb92cd6490cb5b8e8fe2733dd3e53bbb12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 22:03:55 +0700
Subject: [PATCH 500/824] OpenRCT2: force some hostmakedepends from staging for
 icu rebuild

---
 srcpkgs/OpenRCT2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 1f4738bdc46a..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 

From 3dc283c7c23c6632ddfbfc6218212a666bb97ed9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:17:03 +0200
Subject: [PATCH 501/824] warzone2100: update to 4.1.3.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index d878605ff26a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.2
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From b7bf44e1a89aa5fecf2eba4b666b025fa892d4cc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:21:19 +0200
Subject: [PATCH 502/824] linux5.4: update to 5.4.140.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c204d64759c3..9316ea45e0a8 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.138
+version=5.4.140
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
+checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 195ad0a4ed8201c3c43176397b77a01c6d097cbf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:23:51 +0200
Subject: [PATCH 503/824] linux4.19: update to 4.19.203.

---
 srcpkgs/linux4.19/template  |   4 +-
 srcpkgs/linux4.19/templateu | 331 ++++++++++++++++++++++++++++++++++++
 2 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux4.19/templateu

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b79ed782a91c..914f8f45b75f 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.201
+version=4.19.203
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}

From b52d8d996acb8d4b9aac680a0230866a21596e04 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:26:58 +0200
Subject: [PATCH 504/824] linux5.13: update to 5.13.10.

---
 srcpkgs/linux5.13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 2c8c80b9945f..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.9
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 8ee1ab3b5123e860aff832fe1b00a2f2fa5b9a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:31:43 -0400
Subject: [PATCH 505/824] python3-ciso8601: update to 2.2.0.

---
 srcpkgs/python3-ciso8601/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE

From 42435f958a5fa83a270588649d1087fa1d51a798 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:32:02 -0400
Subject: [PATCH 506/824] python3-tifffile: update to 2021.8.8.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 0e9e467e1564..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.30
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 

From 3decb15651195ddd18fcf1d926ee8dfaf0b89927 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:35:35 -0400
Subject: [PATCH 507/824] xpra: update to 4.2.2.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 8f99848d6d57e992173fd15ce2bf6805158f6ffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:37:27 -0400
Subject: [PATCH 508/824] python3-uvloop: update to 0.16.0.

---
 srcpkgs/python3-uvloop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient

From 31486f9f61c9282f4255f4abf3c0995a5298c2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:12 +0200
Subject: [PATCH 509/824] postgresql: update to 9.6.23, adopt.

---
 srcpkgs/postgresql/template | 8 ++++----
 srcpkgs/postgresql/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 6c30501a7c61..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"

From aed625668acd6d519e54907c20efd93b562c6386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:13 +0200
Subject: [PATCH 510/824] postgresql12: update to 12.8.

---
 srcpkgs/postgresql12/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bd3c6efc791346a273eaafad2a7ccab06ba9c498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:14 +0200
Subject: [PATCH 511/824] postgresql13: update to 13.4.

---
 srcpkgs/postgresql13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bfc6885ffbe6fd49b8b9166c284695210f545012 Mon Sep 17 00:00:00 2001
From: Justin Hibbits <chmeeedalf@gmail.com>
Date: Thu, 12 Aug 2021 13:20:16 -0500
Subject: [PATCH 512/824] claws-mail: update to 3.18.0

---
 srcpkgs/claws-mail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From b5751c606cf8fe914d994482d8989f65aeef28f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 12 Aug 2021 21:50:39 +0200
Subject: [PATCH 513/824] Aegisub: rebuild for icu

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)

From fbf27a5a0ca5bcc8986b3ac52626cf827c445405 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:02:33 +0200
Subject: [PATCH 514/824] unbound: update to 1.13.2.

---
 srcpkgs/unbound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {

From 6903859b90dc79aa413e9d329388bbb453757147 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:04:55 +0200
Subject: [PATCH 515/824] k9s: update to 0.24.15.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 5e0531b83dc6009199dc96bd7493ebc67b54fa61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:07:05 +0200
Subject: [PATCH 516/824] skaffold: update to 1.30.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 663f97e1f5f0..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.29.0
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764

From 4ad44630337495dceb4fd1ceb2ea465e48644037 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:11:48 +0200
Subject: [PATCH 517/824] netpbm: update to 10.95.01.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc

From 4a23979ca3b2ba8d84ff63ea0463d573d5586114 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Wed, 11 Aug 2021 02:42:38 +0200
Subject: [PATCH 518/824] libXft: update to 2.3.4

---
 srcpkgs/libXft/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING

From b262c7ceab89d11cbb09b50b49fd28250587de89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 22:14:29 +0200
Subject: [PATCH 519/824] dovecot: remove INSTALL{,.msg}, we don't ship a
 default config anymore

---
 srcpkgs/dovecot/INSTALL     | 9 ---------
 srcpkgs/dovecot/INSTALL.msg | 6 ------
 srcpkgs/dovecot/template    | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg

diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 27a781db5139..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From 8ce3d75f5dd89c33bd033499d8d16daa2a332709 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 5 Aug 2021 22:48:55 -0700
Subject: [PATCH 520/824] CLion: Fix removal of files for unsupported OS/archs

---
 srcpkgs/CLion/template | 43 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index f2ab575cea34..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
 version=2021.2
-revision=1
-archs="i686 x86_64"
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -25,36 +25,37 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/arm
-	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/ppc64le
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/yjpagent.dll
 	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
+	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
+	rm -rf lib/pty4j-native/linux/ppc64le
+
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/performanceTesting/bin/libyjpagent.so
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
 			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so

From 6635ad2495e6000853247d34f5a19d1d05e6b417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 09:46:45 +0700
Subject: [PATCH 521/824] icu: build static with -fPIC

---
 srcpkgs/icu/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index a05d0a7d35a8..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -3,7 +3,7 @@
 #       next soname bump.
 pkgname=icu
 version=69.1
-revision=1
+revision=2
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -18,6 +18,9 @@ homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
 checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
 fi

From e234634ed2daa31a2bce7585235d77c84a87fb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 13:35:07 +0700
Subject: [PATCH 522/824] enchant2: makedepends+="icu-devel"

Transitive via nuspell-devel anyway.
---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 59413b958747..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f49b7f83f0426aa50b278813e2df6113a2d8b33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 Aug 2021 12:51:06 +0200
Subject: [PATCH 523/824] linux5.10: update to 5.10.58.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6242d17550e8..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.56
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 93743856c7fd206837251863e004792d05994454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 19:11:28 +0700
Subject: [PATCH 524/824] webkit2gtk: makedepends+= libnuspell-devel
 libpsl-devel

Via libsoup-devel and enchant2-devel
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 837fd8130803..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -30,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"

From 8000175a12865c52db1534925823ec0418c8dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 Aug 2021 16:26:57 +0700
Subject: [PATCH 525/824] nss: update to 3.69.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 69a8fcc086acf2b39f836bc99f1309ec73dc8d7a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:10:17 +0200
Subject: [PATCH 526/824] thermald: update to 2.4.6.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 4dad19ff8b6f51c6f6972c88e3abf8ef79a82587 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:11:21 +0200
Subject: [PATCH 527/824] terraform: update to 1.0.4.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6

From f4c4d7d16dc07a8feb4047497af40b4b0bb8fc60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:13:38 +0200
Subject: [PATCH 528/824] terragrunt: update to 0.31.4.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt

From d5394b4d94931f5e69b411f228501f8afcbed75d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:15:31 +0200
Subject: [PATCH 529/824] hugo: update to 0.87.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 03cdeb450eae..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.86.1
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md

From 1dae0b40ce7d6fccc56e122d1492d4f8e7c8773a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:19:37 +0200
Subject: [PATCH 530/824] hopper: update to 4.8.2.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes

From dbd04054d8c7f8123bf6342601e915de8c285275 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:20:03 +0200
Subject: [PATCH 531/824] hivex: update to 1.3.21.

---
 srcpkgs/hivex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 1ed578d92e17..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,6 +1,6 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.20
+version=1.3.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes

From 17ca3f128a2307f8e30194efa3ac88877e0c210b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:36:28 +0200
Subject: [PATCH 532/824] iio-sensor-proxy: update to 3.1.

---
 ...heck-for-.pc-files-before-using-them.patch | 32 -------------------
 srcpkgs/iio-sensor-proxy/template             | 13 +++-----
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch

diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy

From a8b2089377cf66f79a90ed008a920a5c754ce3cf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 20:46:17 +0200
Subject: [PATCH 533/824] libkdcraw5: update to 21.08.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7908f9a215df4a1fbea2fa945fc0051c38d8eba6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 21:14:33 +0200
Subject: [PATCH 534/824] gwenview: update to 21.08.0.

---
 srcpkgs/gwenview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19

From d9f91db631b7e3baf864c159158c7e3e0d543dc3 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 12 Aug 2021 22:20:02 +0530
Subject: [PATCH 535/824] Komikku: add patch from upstream

---
 srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ++++++++++++++++++++++
 srcpkgs/Komikku/template                   |  2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch

diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 7a612602214d..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.30.0
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From 9212918f8838f5debf3c73d7ac2f456d39053bf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 3 Aug 2021 08:56:18 +0300
Subject: [PATCH 536/824] xf86-video-amdgpu: update to 21.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }

From ef0f5863d8a296c84f4328fba1b97fe84e8ad25e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:37:05 +0200
Subject: [PATCH 537/824] meld: update to 3.20.4.

---
 srcpkgs/meld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \

From 1a82699f5d2a897ef28951897761d1656e024cc3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:07 +0200
Subject: [PATCH 538/824] 0ad-data: update to 0.0.25.

---
 srcpkgs/0ad-data/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in

From f040aff7bfacdaa61e87b9303f80a9ba16266f8e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:24 +0200
Subject: [PATCH 539/824] 0ad: update to 0.0.25.

---
 srcpkgs/0ad/patches/ppc64.patch               | 113 ------------------
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 -----------------
 srcpkgs/0ad/template                          |   6 +-
 3 files changed, 3 insertions(+), 223 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
deleted file mode 100644
index 95007b32f25e..000000000000
--- a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
-From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 27 Feb 2021 09:31:17 +0000
-Subject: [PATCH] Patch SM78.6 for Rust 1.50
-
-Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-(this fix is integrated in SM78.8)
-
-Reviewed By: s0600204
-
-Differential Revision: https://code.wildfiregames.com/D3590
-
-
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
----
- libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
- libraries/source/spidermonkey/patch.sh        |  4 ++
- 2 files changed, 69 insertions(+)
- create mode 100644 libraries/source/spidermonkey/FixRust150.diff
-
-diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
-new file mode 100644
-index 00000000000..cfb0d58b4a0
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixRust150.diff
-@@ -0,0 +1,65 @@
-+
-+# HG changeset patch
-+# User Emilio Cobos Álvarez <emilio@crisal.io>
-+# Date 1609006565 0
-+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-+# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-+
-+Fixes errors like:
-+
-+  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-+
-+I've left the most specific dependency, but for wgpu the rev is not
-+right, so I've kept the branch which effectively preserves behavior.
-+
-+Differential Revision: https://phabricator.services.mozilla.com/D100485
-+
-+diff --git a/.cargo/config.in b/.cargo/config.in
-+--- a/.cargo/config.in
-++++ b/.cargo/config.in
-+@@ -1,16 +1,16 @@
-+ # This file contains vendoring instructions for cargo.
-+ # It was generated by `mach vendor rust`.
-+ # Please do not edit.
-+ 
-+ [source."https://github.com/shravanrn/nix/"]
-+-branch = "r0.13.1"
-+ git = "https://github.com/shravanrn/nix/"
-+ replace-with = "vendored-sources"
-++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ 
-+ [source."https://github.com/mozilla/rkv"]
-+ git = "https://github.com/mozilla/rkv"
-+ replace-with = "vendored-sources"
-+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
-+ 
-+ [source."https://github.com/mozilla/neqo"]
-+ git = "https://github.com/mozilla/neqo"
-+diff --git a/Cargo.lock b/Cargo.lock
-+--- a/Cargo.lock
-++++ b/Cargo.lock
-+@@ -3200,7 +3200,7 @@
-+ [[package]]
-+ name = "nix"
-+ version = "0.13.1"
-+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ dependencies = [
-+  "bitflags",
-+  "cc",
-+diff --git a/Cargo.toml b/Cargo.toml
-+--- a/Cargo.toml
-++++ b/Cargo.toml
-+@@ -60,8 +60,8 @@
-+ [patch.crates-io]
-+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
-+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
-+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
-+ # failure's backtrace feature might break our builds, see bug 1608157.
-+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+
-diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
-index 58be1fbdef0..879964b0f2e 100644
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
- patch -p1 < ../FixRpiUnalignedFpAccess.diff
- 
-+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-+# Note that this isn't quite the upstream patch to match our version.
-+patch -p1 < ../FixRust150.diff
-+
- # Patch those separately, as they might interfere with normal behaviour.
- if [ "$(uname -s)" = "FreeBSD" ];
- then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f6e6b41899de..2e095d293a6a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
-revision=3
+version=0.0.25
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 

From d303ec56631d7e5e294752fba40b767c9546bb2d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 13:22:34 +0200
Subject: [PATCH 540/824] youtube-viewer: update to 3.9.4.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 631d508f2d7f227cbd47bf51fbbc1c2e80de865e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 14:52:02 +0200
Subject: [PATCH 541/824] knot: update to 3.1.1.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 2188e92dac8b..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 7c493688a8f472de21012b1cd47469115013408d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 15:05:28 +0200
Subject: [PATCH 542/824] wine: update to 6.15.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 30be01e169b2..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.14/dlls/dnsapi/libresolv.c
-+++ b/wine-6.14/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2fa789c7e7..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.14
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
- 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 4624952c79c5813577aef7ec2c948d9b0e9d77b6 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 7 Aug 2021 10:17:38 -0600
Subject: [PATCH 543/824] combine mu and mu4e packages and update to 1.6.3

- combine mu and mu4e packages under (more discoverable) name "mu4e"
  - add `replaces`/`provides` for old "mu" package
- add option for optional guile components
- update to 1.6.3
---
 srcpkgs/mu/template   | 36 ------------------------------------
 srcpkgs/mu4e          |  1 -
 srcpkgs/mu4e/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 36d67ef65cba..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}

From 8f53dc8d60eb3b2e9da062cafeb5cfb409fac9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 544/824] filelight: update to 21.08.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4

From d753b84fb79b7266c1793e9fff39b443afc6cec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 545/824] kaccounts-integration: update to 21.08.0.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From f8128b7a9938cdeabbbc30181123d89a7a421712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 546/824] kaccounts-providers: update to 21.08.0.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 09f2a9c0ce337662bf17a1eb7e800cf320528df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 547/824] kcachegrind: update to 21.08.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2

From a523dbe991eacb2379ef1436aa43110160c2d87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 548/824] kcron: update to 21.08.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4

From 759a233dd267718e423b35d0ec16afc5efc0a3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 549/824] kdialog: update to 21.08.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de

From 6fff1b8760ce35609febe12d11241b4f7de426ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 550/824] keditbookmarks: update to 21.08.0.

---
 .../patches/20.08.3--fix-tests.patch          | 28 -------------------
 srcpkgs/keditbookmarks/template               |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch

diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc

From 0ebc5d7c8fa2cc90a9faba8e87cb197fd71f7c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 551/824] kfind: update to 21.08.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461

From ca77c8b9e0de0769062b41ad6863ec8197ebf44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 552/824] kig: update to 21.08.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4

From 8d65798109dad3689363d30693c42ed2775c365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 553/824] kio-gdrive: update to 21.08.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa

From 6e9f98030fd77c3a95e0588410124bbb2115887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 554/824] kmag: update to 21.08.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91

From c23c5eb633c0863d7c93470078ff540287d6b5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 555/824] kmix: update to 21.08.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad

From 04b2fa8bab48801e2a9c6c50b79e95821d32b5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 556/824] kolourpaint: update to 21.08.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING

From b67a82596d7e1e7db017bc73510539951ec39587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 557/824] kompare: update to 21.08.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4

From 55350a62182af8942d27ae750c34ddea3364ba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 558/824] kpat: update to 21.08.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2

From 07076e646b0321e9d99a5614fe2ea371a90af314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 559/824] kruler: update to 21.08.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af

From ec6e6a94dbd86906a4042717bcf0d4facc978605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 560/824] ksystemlog: update to 21.08.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2

From a67a78dcb80db1694f064b6489941a6bb30fd33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 561/824] kteatime: update to 21.08.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546

From f5301e3f9a2f13fbd723c55636bd141595839e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 562/824] kturtle: update to 21.08.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e

From a57b46c2a7e7b5c6cecdd159d5a0816bcffd8e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 563/824] kwalletmanager: update to 21.08.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963

From fbf62ded4171c457cfe742648e47113f9c68217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 564/824] libkcddb: update to 21.08.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 35b2baae3999832242fa7c48dd858cf75a090484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 565/824] libkdegames: update to 21.08.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f4c118f85c5f1b6a4534898367090d8566ec1b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 566/824] libkomparediff2: update to 21.08.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 819515e0d1f62b50225614992c4014fda5bfcc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 567/824] marble5: update to 21.08.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 40cc4d049a5ca782a967e89ae94efc0fe0ed8de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 568/824] signon-kwallet-extension: update to 21.08.0.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72

From 7369027cd40dd65dba61fb57ef4371cf363f891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 569/824] svgpart: update to 21.08.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102

From ec414ed70833a5b264fd0ad20d4212f0c7e465e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 570/824] umbrello: update to 21.08.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {

From c29ff7224c8b1a82658af9f323f07d0af6603294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 571/824] yakuake: update to 21.08.0.

---
 srcpkgs/yakuake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 61d6e2e645c4..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,7 +1,7 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
-revision=2
+version=21.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e

From bbc686bb5d1319cc3b458e2ae19abd2373881839 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:45:03 +0200
Subject: [PATCH 572/824] linux4.19: update ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 068acd4303087f3926c48f8cccd71300c58552da Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:40:57 +0200
Subject: [PATCH 573/824] linux5.4: update ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 39461a28097f52942e263a12c2021b141ffcd1bb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:43:14 +0200
Subject: [PATCH 574/824] linux5.13: update ppc-dotconfig

---
 srcpkgs/linux5.13/files/ppc-dotconfig | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

From bff15f3d98a9813dc6c26d5f43e23d51cc3acc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 22:49:10 +0700
Subject: [PATCH 575/824] apostrophe: depends on webkit2gtk

---
 srcpkgs/apostrophe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 10c5d6f1c414bd49cd9a5d846c20be1cd8ec952c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 21:51:15 +0700
Subject: [PATCH 576/824] python3-pypandoc: update to 1.6.3.

---
 srcpkgs/python3-pypandoc/patches/no-pip.patch | 20 +++++++++++++++++++
 srcpkgs/python3-pypandoc/template             |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch

diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE

From cc8eb3744a96c36eda0584eaf8e812c2030c2ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:19 +0700
Subject: [PATCH 577/824] python3-usb: update to 1.2.1.

---
 srcpkgs/python3-usb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE

From e07d6dd0f6dbece44f014e7d9f21596d365cac5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:23 +0700
Subject: [PATCH 578/824] python3-elementpath: update to 2.2.3.

---
 srcpkgs/python3-elementpath/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling

From 49796352785b22c246aebf266afafe93ab24d05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:38 +0700
Subject: [PATCH 579/824] python3-pyscard: update to 2.0.1.

---
 srcpkgs/python3-pyscard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 

From 2a4c01d6d395638493880bb818f171d441de03d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:13:50 +0700
Subject: [PATCH 580/824] sip: update to 6.1.1.

---
 srcpkgs/sip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From c6dd168e9c0795eac3ea033d8ecefabe74a0f95e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 Aug 2021 18:54:54 +0200
Subject: [PATCH 581/824] python3-boto3: update to 1.18.21.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE

From 4b2981744107e2329f4f93b7f295aaaa41b1ab00 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 18:36:44 +0200
Subject: [PATCH 582/824] onionshare: remove package

* doesn't work with Flask 2
---
 srcpkgs/onionshare/template       | 23 -----------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/onionshare/template

diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c9349197c278..3b1dbd467489 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -219,6 +219,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4

From ee853fe00a61519dfdd9651c42dcf74fcbab405c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:33 +0200
Subject: [PATCH 583/824] python3-urwidtrees: update to 1.0.3.

---
 srcpkgs/python3-urwidtrees/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a

From b51e816cc26325f4ba577655fe5d53b70f9d55e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:36 +0200
Subject: [PATCH 584/824] stig: update to 0.12.2a0, adopt

---
 srcpkgs/stig/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged

From caac0c84ee55556a6cb776e1d09331d802650176 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 11 Aug 2021 15:13:07 +0100
Subject: [PATCH 585/824] gopls: update to 0.7.1.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE

From d979203bdde59ded044446ea65e27008fc4a0fc0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 14 Aug 2021 20:39:23 +0200
Subject: [PATCH 586/824] ccextractor: update to 0.92

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {

From 78a59e5314e856d316585e4ffedcc71122f48a6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 Aug 2021 11:29:10 -0400
Subject: [PATCH 587/824] python3-matplotlib: update to 3.4.3.

---
 srcpkgs/python3-matplotlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From c31ffeda77396ed711c7d6e616c6a6b24975b83e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 14 Aug 2021 15:42:28 -0500
Subject: [PATCH 588/824] New package: vault-acme-0.0.8.

---
 srcpkgs/vault-acme/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/vault-acme/template

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}

From 2ee53f90094f0c2fa3213b7c6e1f3a54f6318b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 10 Aug 2021 19:56:34 -0300
Subject: [PATCH 589/824] pari: update to 2.13.2.

- enable pthreads build
- switch gp binary to static link libpari; this offsets the slowdown due
  to pthreads
- use -flto and -fno-semantic-interposition which improve speed a little
  bit more
- ship the static library, so external programs can static link
- change of maintainer agreed by sgn

I had to add a minimal patch to the makefile, so that the build step
builds and the install step installs. I will try to upstream that patch.
---
 common/shlibs                       |  1 +
 srcpkgs/pari/patches/makefile.patch | 36 +++++++++++++++++++++++++++++
 srcpkgs/pari/template               | 22 +++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/pari/patches/makefile.patch

diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..301649ded872 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3981,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From ec9683ea5e257d5ac085ca9f6e3693341f86dfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:06:12 -0300
Subject: [PATCH 590/824] giac: revbump for pari

---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ++++++++++++++++
 srcpkgs/giac/template                |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel

From c28d6c6bba4b9f1dde2203dae3e5231ce2fedf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:13:17 -0300
Subject: [PATCH 591/824] qcas: revbump for giac

---
 srcpkgs/qcas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"

From 4e3ef46d6db0a74b28a5f10c72e4ba54700d6651 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 14 Aug 2021 23:34:04 +0200
Subject: [PATCH 592/824] sequeler: update to 0.8.2.

---
 srcpkgs/sequeler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876

From e78ea204eee7715310675231064fa709f830efdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:49 +0200
Subject: [PATCH 593/824] dolphin: update to 21.08.0.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From d78bf319fc55fb69538bfca0fab61d411277266c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:55 +0200
Subject: [PATCH 594/824] akonadi-calendar: update to 21.08.0.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c60065df21d701fc391e8047366dd8744d0f37dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:57 +0200
Subject: [PATCH 595/824] akonadi-contacts: update to 21.08.0.

---
 srcpkgs/akonadi-contacts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 8d1093b15a98c6d186ba6fe7c88051cca4f62b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:58 +0200
Subject: [PATCH 596/824] akonadi-import-wizard: update to 21.08.0.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 835db1dd9696474b57e7640b5b54a9f91d9e2e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:00 +0200
Subject: [PATCH 597/824] akonadi-mime: update to 21.08.0.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 57761126efd9ad7bd7a87c815c976d8848cd918d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:01 +0200
Subject: [PATCH 598/824] akonadi-notes: update to 21.08.0.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 614fe6632bf9f86b8d3e1976ad65c1157fda93de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:02 +0200
Subject: [PATCH 599/824] akonadi-search: update to 21.08.0.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b864620d3eb685f9c1824bc90406e17ac4e3ffb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:04 +0200
Subject: [PATCH 600/824] calendarsupport: update to 21.08.0.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 63e06a6086cb2d6dd04f75e6664ec5b29ff05caf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:05 +0200
Subject: [PATCH 601/824] grantleetheme: update to 21.08.0.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 89c7debabf8b9c1df4c6c529e7c984e67d5797b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:07 +0200
Subject: [PATCH 602/824] kalarmcal: update to 21.08.0.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From fe440257543b665ca49274bdf7dfd91c8a69adb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:08 +0200
Subject: [PATCH 603/824] kcalutils: update to 21.08.0.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5f2f5b27675e6ff8fe02f1759a835d5e7739c1ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:10 +0200
Subject: [PATCH 604/824] kdepim-runtime: update to 21.08.0.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 11131da4d33476ce2cd2902c26860716ee5e21c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:11 +0200
Subject: [PATCH 605/824] kimap: update to 21.08.0.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From cb3097c23cf363a91bed327dee9f1278daa8b3e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 606/824] kldap: update to 21.08.0.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e61c7cbf7fb6b0efd964adaa4fbd95be70a31e62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 607/824] kmail: update to 21.08.0.

---
 srcpkgs/kmail/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca

From 058a491eedd0f621e55cc64f7859cd88e39f866c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:15 +0200
Subject: [PATCH 608/824] kmail-account-wizard: update to 21.08.0.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93

From 94f06479a3992c016230089f355a3f87fd2ca448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:16 +0200
Subject: [PATCH 609/824] kmailtransport: update to 21.08.0.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 26dd67a9164bc031c13a2ebee9b3dd54b317dc9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:17 +0200
Subject: [PATCH 610/824] kmbox: update to 21.08.0.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From de9d9c3b16fd6afdeb8e710f37963cf560326219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 611/824] kmime: update to 21.08.0.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 4ef06ca0dc38d489d551405d8cebf1085d5b0011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 612/824] kde5-baseapps: update to 21.08.0.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="

From a4e744d183e561e3810d323bd78b5ff62ff225ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:20 +0200
Subject: [PATCH 613/824] kontactinterface: update to 21.08.0.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d27be916d104f83e756cd108a82d36dc6399ad0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:21 +0200
Subject: [PATCH 614/824] ksmtp: update to 21.08.0.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e0257d64cf740805fbdcadc5375bf0979821d7fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:23 +0200
Subject: [PATCH 615/824] ktnef: update to 21.08.0.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c54ec5382ea58e513b0ae3cd4b93168c2ebec9e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 616/824] kate5: update to 21.08.0.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 9cf6ba829ce663762c7e4e55f2a9cb6dd5e730d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 617/824] libgravatar: update to 21.08.0.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8797bd702e7f1cd1ceadb514e930cdd3604bfc2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:25 +0200
Subject: [PATCH 618/824] konsole: update to 21.08.0.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From bcb448211a2495d8066836723ca539ca64918cc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:26 +0200
Subject: [PATCH 619/824] libkdepim: update to 21.08.0.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 468616be217df0c41d6c5ed0cd0209ce3fa608d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 620/824] baloo-widgets5: update to 21.08.0.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From a0988bb2e9366cd3cc7a7e633ee6b611c88819ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 621/824] libkgapi: update to 21.08.0.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:

From 21f59b4873d5664f50ead6525aa7b915b34e4a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:28 +0200
Subject: [PATCH 622/824] kio-extras: update to 21.08.0.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d

From a4aa6c2b95334d923f1399cab0c16608e061d51f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:29 +0200
Subject: [PATCH 623/824] libkleo: update to 21.08.0.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e960bdc1a56b15d16ec50a01e66e1fc8912d1e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:31 +0200
Subject: [PATCH 624/824] okular: update to 21.08.0.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build

From d35ac3b69236c74957e71ac9466d5656eac94bc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 625/824] kleopatra: update to 21.08.0.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test

From 9de158a52808919d39908353ea7c00bf36bc2232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 626/824] libkexiv25: update to 21.08.0.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From b1d9dafc24f0f12a9fcf0b89abb44b02fb098965 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:33 +0200
Subject: [PATCH 627/824] libksieve: update to 21.08.0.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f043a73e4273a6bc0e3f84850878bc2e53a999f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:35 +0200
Subject: [PATCH 628/824] mailcommon: update to 21.08.0.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 1063c6ec22a0021d3db7a6880d95bd2084b76288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:36 +0200
Subject: [PATCH 629/824] spectacle: update to 21.08.0.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3

From 1ff4996abe4ab41b343f315ca72b33824d0b83c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:38 +0200
Subject: [PATCH 630/824] libkipi5: update to 21.08.0.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 8fda997448eab42e1d93e705cb328b308e2a9688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:39 +0200
Subject: [PATCH 631/824] messagelib: update to 21.08.0.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 

From 2775b48313e7e44f3789921c04c72a481277f643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:40 +0200
Subject: [PATCH 632/824] pimcommon: update to 21.08.0.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 65ac8e860ddba67db7d2dca42fed955c6db10a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:42 +0200
Subject: [PATCH 633/824] kpimtextedit: update to 21.08.0.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 710de4475b5c2ced45bdad7dc071ca6c976d8196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:43 +0200
Subject: [PATCH 634/824] kidentitymanagement: update to 21.08.0.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 5a0fefdf0ba944aa7373117aeb6a1c029469279b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:45 +0200
Subject: [PATCH 635/824] akonadi5: update to 21.08.0.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 354ada6ff88605a0fa106f6ebeb5a159939670ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:46 +0200
Subject: [PATCH 636/824] pim-data-exporter: update to 21.08.0.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d

From 3a101032252415b8789301dc62dd3a5e31d5f19d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:06 +0200
Subject: [PATCH 637/824] dolphin-plugins: update to 21.08.0.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4

From 591550f8e53b644e3924701db22636268ed433b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:12 +0200
Subject: [PATCH 638/824] mailimporter: update to 21.08.0.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 900ab560fdabf75643ff6b6b816ae7b995e775ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:52:44 +0200
Subject: [PATCH 639/824] khelpcenter: update to 21.08.0.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 18ffdbb0bb25777fc2cc2915c6d29908648a1246 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:56 +0200
Subject: [PATCH 640/824] ark: update to 21.08.0.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build

From c301c6d3b4adc1da88b3fa3c3e39843bb3276383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:58 +0200
Subject: [PATCH 641/824] elisa: update to 21.08.0.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1fb56de03284c99da04ecef211de3bf1c0fcb63b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:00 +0200
Subject: [PATCH 642/824] kdeconnect: update to 21.08.0.

---
 srcpkgs/kdeconnect/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3

From f8139ae47746efff68c06859067c3a15ecefc208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:01 +0200
Subject: [PATCH 643/824] kdegraphics-thumbnailers: update to 21.08.0.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab

From 01e4e04c9db391b521c1e19645f19acfdd654d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:03 +0200
Subject: [PATCH 644/824] knights: update to 21.08.0.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3

From daecacf95faca11c2fa226840d9262d176f78c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:04 +0200
Subject: [PATCH 645/824] kqtquickcharts: update to 21.08.0.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d9ac04925c82400ef2b88d59684a7eae87d324b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:41 +0200
Subject: [PATCH 646/824] gespeaker: remove package

doesn't work with espeak-ng
---
 srcpkgs/gespeaker/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/gespeaker/template

diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15

From ae7d3175bc19a6bd23e61dc3520a54989e2a2721 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:54 +0200
Subject: [PATCH 647/824] removed-packages: add gespeaker

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b1dbd467489..292ffc7ea954 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -69,6 +69,7 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1

From ebed12cd4a5c3f6ffbdca8486af5ed443f719b29 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 14 Aug 2021 01:26:36 +0300
Subject: [PATCH 648/824] bmake: update to 20210808.

---
 srcpkgs/bmake/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ef3463e7e554..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210803
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {

From 02dd3d09f1d29734bdcc2c0946705d08f95c1dd0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 14 Aug 2021 11:46:36 +0200
Subject: [PATCH 649/824] ardour: update to 6.9.

---
 srcpkgs/ardour/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"

From 178bdd212e3ef94478d24c04695099bfb4846a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:27:14 +0200
Subject: [PATCH 650/824] doomretro: update to 4.2.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251

From 14c3ed95f9008695845252af7068464c01fb6be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:36:47 +0200
Subject: [PATCH 651/824] exiftool: update to 12.30.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f

From 819e759ab49df8fa6c114633f8ba8f43d8357627 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 15 Aug 2021 17:51:22 +0700
Subject: [PATCH 652/824] kamoso: update to 21.08.0

---
 srcpkgs/kamoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602

From f2e0b10d1174742bcc866d5c0fecb2e3cb4cac42 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 19:23:52 +0300
Subject: [PATCH 653/824] evilwm: update to 1.3.1.

---
 srcpkgs/evilwm/files/evilwm.desktop | 11 -----------
 srcpkgs/evilwm/template             | 17 +++++++++--------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop

diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }

From 9a3759752e37d746fe81db23b9a0fdae3ad0826c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:20:00 +0200
Subject: [PATCH 654/824] zathura-pdf-mupdf: update to 0.3.7

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..256a5d51f883 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
-revision=2
+version=0.3.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
 LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"

From 8b924b59393fc0bb4f1da6e456aa601c51189d16 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:21:42 +0200
Subject: [PATCH 655/824] zathura-ps: update to 0.2.7

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE

From 0fd004294a119c140fd53f831e92bae8f96c5576 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 13 Aug 2021 08:50:01 +0200
Subject: [PATCH 656/824] xmobar: update to 0.39

---
 srcpkgs/xmobar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 87afe34b69f6a143b4d1816e27955bf45d12f65b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 12 Aug 2021 16:58:56 +0300
Subject: [PATCH 657/824] libjpeg-turbo: update to 2.1.1.

---
 srcpkgs/libjpeg-turbo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From a9731c17e327e6c2ad700673ce35e7176cfcb57c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 658/824] x265: update to 3.5.

---
 common/shlibs         |  2 +-
 srcpkgs/x265/template | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 301649ded872..42fd333f33b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi

From 4e9f6f105f2c31e89333cbadd0fe0c465e2876ad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 659/824] ffmpeg: revbump for x265

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 792fb7290d4871457cd84725f0c1e98f14d4d8b8 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 660/824] vlc: revbump for x265

also add ci-skip due to fail on test/run_vlc.sh
---
 srcpkgs/vlc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"

From e05d74ad6dcfd7ed337adcf7ad80334b765ccd09 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 661/824] libheif: revbump for x265

---
 srcpkgs/libheif/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"

From b081e58bbe8e7f5ad79ec6a6154d0c440309bdf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 662/824] handbrake: revbump for x265

---
 srcpkgs/handbrake/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden

From 9d7463b59ba7f71296dd3d323cbc0c113763b865 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 663/824] gst-plugins-bad1: revbump for x265

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 6c9e2ac11a83bc2955181e9969bb50a0df33d190 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 664/824] avidemux: revbump for x265

---
 srcpkgs/avidemux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"

From 3a51724b41f507370e1287dacc5f8ca262b263d2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 17:20:59 -0400
Subject: [PATCH 665/824] spotify-qt: update to 3.7.

---
 .../spotify-qt/patches/disable-crash-handler.patch | 14 ++++++++++++++
 srcpkgs/spotify-qt/template                        |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch

diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8

From eef9c0c820a80154b0e84fe6dc1c966a3a6e144b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 15 Aug 2021 23:56:48 +0200
Subject: [PATCH 666/824] lagrange: update to 1.6.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 15992e57dbaa..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.2
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md

From 867c04369c5ee4324d553d47ce06bec4b91e2f84 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:43 +0400
Subject: [PATCH 667/824] fmt: update to 8.0.1.

---
 common/shlibs        | 2 +-
 srcpkgs/fmt/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42fd333f33b9..d24c2bacbc9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE

From 019a84a94e9d592e31f3919275dd45f1c4cd371f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 668/824] spdlog: update to 1.9.1.

---
 srcpkgs/spdlog/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"

From 6a646d75fe9ac6531c6b5bbe6185010c9e5f828a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 669/824] cherrytree: rebuild against libfmt.so.8

---
 srcpkgs/cherrytree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 8789cd37dba7..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=0.99.39
-revision=1
+revision=2
 wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"

From e8d16a2335617d3ca804e3702322dd3fe29716c6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 670/824] Waybar: rebuild for libfmt.so.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 +++++++++++++++++++
 srcpkgs/Waybar/template                       |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}

From 06928a0fc668aba2d235d0e17325708ee29d604e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 671/824] gerbera: rebuild against libfmt.so.8

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From 55445ac53e9b4ed1d91d313ac6847915dce83da4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 672/824] kodi: fold kodi-rpi into it, rebuild for libfmt.so.8

We don't want to maintain kodi 18.x into eternity (which would start
with patching it correctly for libfmt.so.8), and, as explained in
9f8647640b3ce3e4a99f0ba7022eb6d55ba77c97, current kodi can't be built
for rpi specifically anymore. We will assume normal kodi is enough.
---
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 ---
 .../patches/add-missing-includes.patch        |  10 --
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 ------
 .../disable-static-texturepacker-build.patch  |  11 --
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 -----------
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 --
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 --
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 ---
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 ------
 srcpkgs/kodi-rpi/template                     | 119 ------------------
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 ++
 srcpkgs/kodi/template                         |   8 +-
 17 files changed, 15 insertions(+), 364 deletions(-)
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

From 94af74f98abffb0dc18c7803d9a755330fe161fc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 673/824] mkvtoolnix: rebuild against libfmt.so.8

---
 srcpkgs/mkvtoolnix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0875991a872f..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=60.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt

From fe75f492fb5d4344d3223ad6873624e3fc436543 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 674/824] nheko: rebuild against libfmt.so.8

---
 srcpkgs/nheko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel

From ff0dfc66165192471af70cb8640049b3099ea5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 8 Aug 2021 18:38:31 -0300
Subject: [PATCH 675/824] cryfs: rebuild against libfmt.so.8

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d8f855a80af..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

From 1b91642c8c52a1904f911be63a7ea898e74762f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 18:31:05 -0300
Subject: [PATCH 676/824] 0ad: rebuild against libfmt.so.8

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 2e095d293a6a..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.25
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 0d66ebda9af3e5d6f0bc78d8b2f6d34cb22c8a52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 20:22:27 -0400
Subject: [PATCH 677/824] zathura-pdf-mupdf: depends on gumbo now

---
 srcpkgs/zathura-pdf-mupdf/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 256a5d51f883..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,11 +1,12 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
 version=0.3.7
-revision=1
+revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -15,8 +16,6 @@ distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.t
 checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }

From a3833c178ef0ae3fe99aa21e647928d533970260 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:13:43 +0200
Subject: [PATCH 678/824] gucci: update to 1.5.0.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..58cdb9f09567 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
 
 post_install() {
 	vlicense LICENSE

From 6146d97a1abd17233b9ad813ef5a69162fe5246e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:14:43 +0200
Subject: [PATCH 679/824] python3-pyinfra: update to 1.4.12.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index b7c5bebb3e56..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.11
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 0ac449e9d9ff17d5c1401deeeefb9a960458ec66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:17:01 +0200
Subject: [PATCH 680/824] openbsd-netcat: update to 1.217.1.

---
 srcpkgs/openbsd-netcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From b20e341847734fcd18d55b45e3499a2f2caed0ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 13:10:03 +0200
Subject: [PATCH 681/824] gucci: fix checksum.

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 58cdb9f09567..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE

From d82e0b4f3787f56dbe28f0bf4ae90bdf68d6519c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:52:54 +0300
Subject: [PATCH 682/824] New package: libdecor-0.1.0_1

---
 common/shlibs             |  1 +
 srcpkgs/libdecor-devel    |  1 +
 srcpkgs/libdecor/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template

diff --git a/common/shlibs b/common/shlibs
index d24c2bacbc9e..befa6484dfee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,4 @@ liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From bbcbbeaec95ea31fcb759fadcf9a474be13190b0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:53:28 +0300
Subject: [PATCH 683/824] SDL2: update to 2.0.16.

---
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch | 32 +++++++++++++++++++
 srcpkgs/SDL2/template                         | 24 +++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch

diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi

From e8a936defab94d59c64ebcf0a1ad8e33dc4abbdf Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Fri, 13 Aug 2021 13:48:11 +0200
Subject: [PATCH 684/824] pandoc: update to 2.14.0.3

---
 srcpkgs/pandoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes

From 2e5f7e7179a68671dd08480535e3b6d06be7af9e Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 16 Aug 2021 17:47:30 +0100
Subject: [PATCH 685/824] font-iosevka: update to 10.0.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 1388c2af3ccd..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=9.0.1
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
-df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
-be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 315555c5ace34fb7a8f06c7bdc3059ada89baab7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:38 +0200
Subject: [PATCH 686/824] attica: update to 5.85.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build

From 297a51d7e6760c1b4f924366b3f8935894c129bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:39 +0200
Subject: [PATCH 687/824] baloo5: update to 5.85.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build

From eaad4ed9eaa001ac52e9dd19ca6327b88a1c1306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:40 +0200
Subject: [PATCH 688/824] bluez-qt5: update to 5.85.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build

From 4ffbb41c2271a1b72d19bbabed45db58654b5d42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:42 +0200
Subject: [PATCH 689/824] breeze-icons: update to 5.85.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 9bb4588b16b6c53e2b6fb9339c6379899275d56c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:43 +0200
Subject: [PATCH 690/824] extra-cmake-modules: update to 5.85.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {

From 90378019b590c05c84e9198972eac9fc66d2ab18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:45 +0200
Subject: [PATCH 691/824] frameworkintegration: update to 5.85.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From f93152fbcf2e8ec8fdcf9f70bb937a7979481c20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:46 +0200
Subject: [PATCH 692/824] kactivities5-stats: update to 5.85.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c6e0a35f1eb4c4b430f43dfc729b476f442b0cbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:48 +0200
Subject: [PATCH 693/824] kactivities5: update to 5.85.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 0caf0735441330851821931f791b398307087954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:49 +0200
Subject: [PATCH 694/824] kapidox: update to 5.85.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 2654859f4f9d8fb5e97f337a096319834a3abf93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:51 +0200
Subject: [PATCH 695/824] karchive: update to 5.85.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2481e284dae555bbbac6fe5cb82aeeaad3915326 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:52 +0200
Subject: [PATCH 696/824] kauth: update to 5.85.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build

From 78c8468ccc6bfedd0e21fe1dafefcadf4dbd5a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:53 +0200
Subject: [PATCH 697/824] kbookmarks: update to 5.85.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 7bbcdcca1090e9690fa314c95086f7b3a5995622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:55 +0200
Subject: [PATCH 698/824] kcalendarcore: update to 5.85.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {

From 2500fd5c0eb8abd9bb397fd45147d65333caac3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:56 +0200
Subject: [PATCH 699/824] kcmutils: update to 5.85.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 97660c36441c383de50fded0e95315059c2d0cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:58 +0200
Subject: [PATCH 700/824] kcodecs: update to 5.85.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From b2431451836546c2681f63bf3652fdf1df44832d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:59 +0200
Subject: [PATCH 701/824] kcompletion: update to 5.85.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From ef4aa708ad06563e44ed1250e44c6d5b7e16c8f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:00 +0200
Subject: [PATCH 702/824] kconfig: update to 5.85.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build

From 030dd65a558eaf906866e59e9088536d110439df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:02 +0200
Subject: [PATCH 703/824] kconfigwidgets: update to 5.85.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 115a9ee52b940fd666702755ab507229e7f88ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:03 +0200
Subject: [PATCH 704/824] kcontacts: update to 5.85.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 16e8a71ffae10485ca2408d2d7b2188740e2e4f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:05 +0200
Subject: [PATCH 705/824] kcoreaddons: update to 5.85.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8ad48d7ce9efca6c8d955eb404f6289e6634a248 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:06 +0200
Subject: [PATCH 706/824] kcrash: update to 5.85.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 5b09310a680fad7daecb6cd6f5ff5baef7073194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:07 +0200
Subject: [PATCH 707/824] kdav: update to 5.85.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2e1a4b123118a28a51842356ba65f22ffecbb908 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:09 +0200
Subject: [PATCH 708/824] kdbusaddons: update to 5.85.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build

From a6063edcb015d98a9516b6459a93dd7e39725fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:10 +0200
Subject: [PATCH 709/824] kdeclarative: update to 5.85.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build

From b58463cebde137bbaf344593b4dac236d82ea73b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:11 +0200
Subject: [PATCH 710/824] kded: update to 5.85.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 813e5d50e9ab6098d809790c647fef291d1bbcfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:13 +0200
Subject: [PATCH 711/824] kdelibs4support: update to 5.85.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From f26ab38313ff931308950d33a2157f473aa65775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:15 +0200
Subject: [PATCH 712/824] kdesignerplugin: update to 5.85.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 074064cab85ad195ed54fad3365110bb65697fb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:16 +0200
Subject: [PATCH 713/824] kdesu: update to 5.85.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 6723eb7a14f95df08e70c668b952b5293eac4f14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:17 +0200
Subject: [PATCH 714/824] kdewebkit: update to 5.85.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 8dedc37cca62f7ca300900015350fd93a47130c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:19 +0200
Subject: [PATCH 715/824] kdnssd: update to 5.85.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 96804847213c4cdc475d68386eb9f3d56374640b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:20 +0200
Subject: [PATCH 716/824] kdoctools: update to 5.85.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From d89f2ab2b0d207eb6c810ee744ac26c6162c250b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:22 +0200
Subject: [PATCH 717/824] kemoticons: update to 5.85.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c95c937028c6d7f3d3bab11797a647cb6ced7e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:23 +0200
Subject: [PATCH 718/824] kfilemetadata5: update to 5.85.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 091aeb80416fbdc2d1b1e80f06aed9f0f89c63c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:25 +0200
Subject: [PATCH 719/824] kglobalaccel: update to 5.85.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From aafcd6bc146b679535e106d5c5bb1019c11462e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:26 +0200
Subject: [PATCH 720/824] kguiaddons: update to 5.85.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 20fa2641f624e1ab60de830874a0c74d7d3571d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:27 +0200
Subject: [PATCH 721/824] kholidays: update to 5.85.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 7b73c43f3b4b56bbc28354f7e4188d7e0f1204ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:29 +0200
Subject: [PATCH 722/824] khtml: update to 5.85.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 384d745162219a27ff6e001ea053a0897d4786f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:31 +0200
Subject: [PATCH 723/824] ki18n: update to 5.85.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 27c2a331f8d6a3f30913a40ea5143374521a9b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:32 +0200
Subject: [PATCH 724/824] kiconthemes: update to 5.85.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 2f4e82c1a70b0aabb5ba6d0474c9f6e4498118dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:33 +0200
Subject: [PATCH 725/824] kidletime: update to 5.85.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 39482710f0967436af2ed135eca26d0da46843c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:35 +0200
Subject: [PATCH 726/824] kimageformats: update to 5.85.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799

From a123ee2023f204bcf2ba4ad1f316127607d3e63d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:36 +0200
Subject: [PATCH 727/824] kinit: update to 5.85.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"

From efd50809ce5066ae67f4ba5a340a745271230bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:38 +0200
Subject: [PATCH 728/824] kio: update to 5.85.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build

From a0300ad364943a3e77c8e96161763eca2ff446ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:39 +0200
Subject: [PATCH 729/824] kirigami2: update to 5.85.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 6322622b6a74dd5cf88a9fda7341d9e284124826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:41 +0200
Subject: [PATCH 730/824] kitemmodels: update to 5.85.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From a5221ce5675ca10bebafebffb7092ab10de05028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:42 +0200
Subject: [PATCH 731/824] kitemviews: update to 5.85.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From d8246fff44a617073bf2ab61f80a47aa4d8265cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:43 +0200
Subject: [PATCH 732/824] kjobwidgets: update to 5.85.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 30f55c806e4da935760e6a9d943691e183a4f270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:45 +0200
Subject: [PATCH 733/824] kjs: update to 5.85.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0663e68594a81f244916681ae8ed76c9d1f80723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:46 +0200
Subject: [PATCH 734/824] kjsembed: update to 5.85.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 4ad01687182714a8f34045e93b8ea522138e538e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:47 +0200
Subject: [PATCH 735/824] kmediaplayer: update to 5.85.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 37569ee6b90c3438a5b8c1288e9f58e6da4e77ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:49 +0200
Subject: [PATCH 736/824] knewstuff: update to 5.85.0.

---
 srcpkgs/knewstuff/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 156fa1a0102b..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,7 +1,7 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
-revision=2
+version=5.85.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 6c40532fd219842003359715b5e85ac2d820ac7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:50 +0200
Subject: [PATCH 737/824] knotifications: update to 5.85.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 10f686745a94f133589ba0b6fd39baa5a425449d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:52 +0200
Subject: [PATCH 738/824] knotifyconfig: update to 5.85.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 11f08dcda0bd53767f4429f20f565874fbb40491 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:53 +0200
Subject: [PATCH 739/824] kpackage: update to 5.85.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 83081a01acf88dcce7ceab0227e74e621dac39bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:54 +0200
Subject: [PATCH 740/824] kparts: update to 5.85.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!

From 16c4f342f6ce383a9a90345908ad7fe2a3602022 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:56 +0200
Subject: [PATCH 741/824] kpeople: update to 5.85.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build

From 9db8d17397c905944b2152a52689a1327df127c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:57 +0200
Subject: [PATCH 742/824] kplotting: update to 5.85.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e2835761669d71ef968242d49d53531d9ca665e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:58 +0200
Subject: [PATCH 743/824] kpty: update to 5.85.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 83ad5b256a11ce26d15b93a13da782fe8ca7f137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:00 +0200
Subject: [PATCH 744/824] kquickcharts: update to 5.85.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build

From a8f17ad4b7c529da8a75a53378872a2867cb5a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:01 +0200
Subject: [PATCH 745/824] kross: update to 5.85.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From db90af54f37dc4434da4b35f3b9b308ac372206e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:02 +0200
Subject: [PATCH 746/824] krunner: update to 5.85.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build

From 17735616321966ba538f764c9f9e965d79e36e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:03 +0200
Subject: [PATCH 747/824] kservice: update to 5.85.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 30857293f5527afe39f9490d3171497746d7f7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:05 +0200
Subject: [PATCH 748/824] ksolid: update to 5.85.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 50e1d866b0962a19cae13349f7d13b72219709ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:07 +0200
Subject: [PATCH 749/824] ktexteditor: update to 5.85.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build

From 8e825ae021e09753b5ac54f1dbd7b963fec6708d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:08 +0200
Subject: [PATCH 750/824] ktextwidgets: update to 5.85.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 50429eef0037466f1ad806a85b05669ac389bccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:10 +0200
Subject: [PATCH 751/824] kunitconversion: update to 5.85.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 11494033e7820539ef168e0be9e8b42cf4ac6439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:11 +0200
Subject: [PATCH 752/824] kwallet: update to 5.85.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 96d851e1d3a418e69a482db8b56b3620b7d25332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:13 +0200
Subject: [PATCH 753/824] kwayland: update to 5.85.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5b8613a8535c44de54097b494132890759f480e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:14 +0200
Subject: [PATCH 754/824] kwidgetsaddons: update to 5.85.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build

From 76f168943e19230ffd6d40404fbe1b9011d7af7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:16 +0200
Subject: [PATCH 755/824] kwindowsystem: update to 5.85.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 011a64dc3e104ca6c147934fc6adc82d9dc616fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:17 +0200
Subject: [PATCH 756/824] kxmlgui: update to 5.85.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build

From 74c6b7f14952dddcd702685aa22619d9c15ac26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:18 +0200
Subject: [PATCH 757/824] kxmlrpcclient: update to 5.85.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d311e117910bfe9faf5416a41d7b9314bfbad1ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:20 +0200
Subject: [PATCH 758/824] modemmanager-qt5: update to 5.85.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build

From 5fa89a37b3e714cecc3edd432e530bff81bd4fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:22 +0200
Subject: [PATCH 759/824] networkmanager-qt5: update to 5.85.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build

From 8279cae0cc1f3ed628ba50af7ea840a57cae35b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:56 +0200
Subject: [PATCH 760/824] oxygen-icons5: update to 5.85.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 98053b36a5d72f02b663a4aaa423ffd2d4a299b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:58 +0200
Subject: [PATCH 761/824] plasma-framework: update to 5.85.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build

From c915834b2b43b7546f9ac3e84d45211611eb3844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:59 +0200
Subject: [PATCH 762/824] prison: update to 5.85.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 668d46804d7a68c752b25f92d5188ceec986a951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:01 +0200
Subject: [PATCH 763/824] purpose: update to 5.85.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build

From c64ea90cfb70af59986f09c4d2c3a1ecaf97cca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:02 +0200
Subject: [PATCH 764/824] qqc2-desktop-style: update to 5.85.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e5ed77074972bf1556556b829ed68a5b1d4dd1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:03 +0200
Subject: [PATCH 765/824] sonnet: update to 5.85.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From d630a834a6a19ece25d163a6fec0b0cb679beea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:05 +0200
Subject: [PATCH 766/824] syndication: update to 5.85.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"

From edd8544fc278b46be1d94ad52fba6557b772f101 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:07 +0200
Subject: [PATCH 767/824] syntax-highlighting: update to 5.85.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 52f74120e733b02efc21a04d2f89d35582c7f0f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:08 +0200
Subject: [PATCH 768/824] threadweaver: update to 5.85.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 06d6876c9d45bae74a2b6e68143cf3d8c5b7dfd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:38:43 +0200
Subject: [PATCH 769/824] libspa-ffmpeg: remove package

this plugin is useless right now, so removing it to break a cycle
SDL2 -> pipewire -> ffmpeg -> SDL2
---
 srcpkgs/libspa-ffmpeg     |  1 -
 srcpkgs/pipewire/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libspa-ffmpeg

diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {

From f96e390b5b527a5c3b7fb6b18fa41d396a84bf32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:39:04 +0200
Subject: [PATCH 770/824] removed-packages: add libspa-ffmpeg and revbump

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 292ffc7ea954..2bba802eef79 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=48
+revision=49
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -324,6 +324,7 @@ replaces="
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
  nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From b2c141998e8bb89f0f9e291881e1df3f8acc9d7f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 15 Aug 2021 18:47:02 +0300
Subject: [PATCH 771/824] wob: update to 0.12.

---
 srcpkgs/wob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE

From ff7b407a82718d434950e44708f35404ec74ac75 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Tue, 17 Aug 2021 13:27:35 +0300
Subject: [PATCH 772/824] i3status-rust: update to 0.20.3.

---
 srcpkgs/i3status-rust/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 30d649d891b4e6930f0fdccb737c524690ab56f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:10 +0700
Subject: [PATCH 773/824] perl-CGI: depends on perl-HTML-Parser

Even Debian has this mandatory dependencies
---
 srcpkgs/perl-CGI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From bf88ea392c9a968169eaab53653736b86cf7033e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:11 +0700
Subject: [PATCH 774/824] git: update to 2.33.0.

---
 srcpkgs/git/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 26daa34f23b07cab2e206c6c2e8792fef2a721e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:13 +0700
Subject: [PATCH 775/824] chroot-git: update to 2.33.0.

---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..2bdb4d76bee0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,20 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	checkdepends="perl gnupg"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
@@ -28,7 +27,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +37,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -52,6 +53,10 @@ do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }

From 09c9a277314b7a9b0fa14dbd4c5489c4e1222f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 21:28:05 +0700
Subject: [PATCH 776/824] chroot-git: use masterdir's zlib-devel in bootstrap

---
 srcpkgs/chroot-git/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 2bdb4d76bee0..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -14,8 +14,6 @@ checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -47,6 +45,9 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {

From c6e810ddb257dc6f23e81c00a935beb31bca7d49 Mon Sep 17 00:00:00 2001
From: auronandace <81362994+auronandace@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:54:22 +0100
Subject: [PATCH 777/824] alacritty: update to 0.9.0

---
 srcpkgs/alacritty/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 1493be14f28c79e90fb222e0206b38dc0eb4540c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 15:46:15 +0200
Subject: [PATCH 778/824] perl-IO-Socket-SSL: update to 2.072.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d

From f72397c8c87688f45f27333190ba881c8cd68465 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 19:15:01 +0200
Subject: [PATCH 779/824] libx86: fix illegal instruction in LRMI_init.

E.g. triggered by read-edid.
Change upstream to debian source.
Adopt.
---
 srcpkgs/libx86/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}

From 8467dd905d2f784b4de7259c608a8c2375b7d996 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:40:27 +0200
Subject: [PATCH 780/824] linux5.4: update to 5.4.141.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9316ea45e0a8..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.140
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From cc351820d2fc87850d622e155cfbacf5e2103c35 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:37:02 +0700
Subject: [PATCH 781/824] ktuberling: update to 21.08.0

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297

From d96db658c08314db71d39604eeb8515b639e67a9 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:32:46 +0700
Subject: [PATCH 782/824] krfb: update to 21.08.0

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592

From 861a06b86d5f3389a778dd8760c377ea7cf45447 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:42:19 +0200
Subject: [PATCH 783/824] linux4.19: update to 4.19.204.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 914f8f45b75f..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.203
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From e3acb7dab578180bda9cdd6b8a2ce891faaf73fa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 20:00:21 +0200
Subject: [PATCH 784/824] smplayer: update to 21.8.0.

---
 srcpkgs/smplayer/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {

From 85788cebabfb520064ffd2bb5ef894e796cdaed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 17:56:19 +0200
Subject: [PATCH 785/824] xbps-src: source msg_warn before its first use

---
 xbps-src | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..5e75926c5ad5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -689,12 +689,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +696,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 106b97096f88a0d97e9528d55e6bd510c86126c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 18:58:39 +0200
Subject: [PATCH 786/824] xbps-src: limit warning on file:/// mirror to related
 targets

---
 xbps-src | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 5e75926c5ad5..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }

From 6fad3941d4d46322eeaabd6d1d02bc1002fcbc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:30 +0200
Subject: [PATCH 787/824] diffoscope: update to 180.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e

From 52c52d339096431b3f82c03f6a2ce00c0837b4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:31 +0200
Subject: [PATCH 788/824] hunspell-pl_PL: update to 20210731.

---
 srcpkgs/hunspell-pl_PL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip

From 8942d2f87099d27784a09b841e2957a8d9ada190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:32 +0200
Subject: [PATCH 789/824] python3-libarchive-c: update to 3.1.

---
 srcpkgs/python3-libarchive-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103

From f191db1d9cdfde83d6dba481c9726d7a995ab016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:33 +0200
Subject: [PATCH 790/824] python3-pysol_cards: update to 0.10.2.

---
 srcpkgs/python3-pysol_cards/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE

From e6a84dc43c3e193f3646bce3000ae8c41ba39a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:34 +0200
Subject: [PATCH 791/824] tox: update to 3.24.1.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 2b65cf79d475eaf53a3bc75d4f8fe1bce7f3d028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:50:44 +0200
Subject: [PATCH 792/824] konversation: update to 21.08.0.

---
 srcpkgs/konversation/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi

From 88b2e95d7619d7296352a71bb026f3ff934b9246 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:00:52 +0700
Subject: [PATCH 793/824] gnome-desktop: update to 40.3

---
 srcpkgs/gnome-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"

From 7a6acd873d5d2c27dc975ceac5196d075386f778 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:34:23 +0700
Subject: [PATCH 794/824] gnome-shell: update to 40.3

---
 srcpkgs/gnome-shell/template | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }

From c638ca21e450284db0777605fa8c13faa1e7da57 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 03:39:28 +0700
Subject: [PATCH 795/824] gnome-shell-extensions: update to 40.3

---
 srcpkgs/gnome-shell-extensions/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b

From 0ab4c8bdad466fa14db4a2676c35639e3ce77799 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:18:12 +0200
Subject: [PATCH 796/824] gnome-shell-mousewheel-zoom: remove package

* inactive
* doesn't work with current GNOME
---
 srcpkgs/gnome-shell-mousewheel-zoom/template | 23 --------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template

diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}

From 4d4179442f372b361655bbb9749c5426b03cd987 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:19:25 +0200
Subject: [PATCH 797/824] removed-packages: add gnome-shell-mousewheel-zoom

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2bba802eef79..3565931e6fa4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6

From 92bb9bd99f9d46d5819230044574c55708adf036 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:51:05 +0200
Subject: [PATCH 798/824] img2pdf: disable tests

tests need ImageMagick6
---
 srcpkgs/img2pdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6

From 41e875032cdb3707596cb8b965b89f493dc96356 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:52:41 +0200
Subject: [PATCH 799/824] ImageMagick6: remove package

---
 srcpkgs/ImageMagick6/template | 86 -----------------------------------
 srcpkgs/ImageMagick6/update   |  1 -
 srcpkgs/libmagick6            |  1 -
 srcpkgs/libmagick6-devel      |  1 -
 srcpkgs/libmagick6-perl       |  1 -
 5 files changed, 90 deletions(-)
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 213d98a37659..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file

From cf2db54eaec8ad87e17d354bc3b6332995155ac8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:53:22 +0200
Subject: [PATCH 800/824] removed-packages: add ImageMagick6 and revbump

---
 srcpkgs/removed-packages/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3565931e6fa4..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=49
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -182,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 34076e87e24b954c87ed64f392692b096b0568f0 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 17 Aug 2021 19:05:44 -0400
Subject: [PATCH 801/824] ejabberd: update to 21.07.

---
 srcpkgs/ejabberd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"

From 713f647d89fa4d0ff9e2cff95853c59c5a44d2a6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:04:01 -0400
Subject: [PATCH 802/824] mongo-c-driver: update to 1.19.0.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From d7c095db6829659864e770dbc4710f388ecc32ac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:10:49 -0400
Subject: [PATCH 803/824] pcsclite: update to 1.9.3.

---
 srcpkgs/pcsclite/patches/python3.patch | 12 +++---------
 srcpkgs/pcsclite/template              |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd

From dc2b89ab40fb0654975fe16c1bc4d80d3d3f70e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:17:43 -0400
Subject: [PATCH 804/824] oidentd: update to 3.0.0.

---
 srcpkgs/oidentd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd

From c0d765f99dafcece0ac674f5fba702b61ebe8c00 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:19:02 -0400
Subject: [PATCH 805/824] sqlmap: update to 1.5.8.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {

From da71c8b8f4c3922c14294fa177680cffa6ccee50 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:30:25 -0400
Subject: [PATCH 806/824] libnsl: update to 2.0.0.

---
 common/shlibs           | 2 +-
 srcpkgs/libnsl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index befa6484dfee..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3658,7 +3658,7 @@ libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
 libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi

From 9b2bb5ae2c2f1f6bc05918d726b2897685456149 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:25:57 -0400
Subject: [PATCH 807/824] log4cpp: bump for libnsl

---
 srcpkgs/log4cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"

From 8ad2ca7965e1135e103d4a258fb7197f3da8e244 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 17 Aug 2021 10:18:54 -0500
Subject: [PATCH 808/824] kitty: update to 0.23.1.

Closes: #32541 [via git-merge-pr]
---
 srcpkgs/kitty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From eeb785239f5601a4340099f9cccc617bce96656c Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:48:09 +0200
Subject: [PATCH 809/824] fuzzel: update to 1.6.2.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 76d7618695262cc23d9ba8fcaa8431608b2867bb Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:50:37 +0200
Subject: [PATCH 810/824] fcft: update to 2.4.5.

---
 srcpkgs/fcft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 678d3823497b8d015d91254beefd45ba6db20494 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH 811/824] dbeaver: update to 21.1.5.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.4
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {

From 7c4b90200da0639a4923cab9033ff9b056a0c5ae Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 13 Aug 2021 13:38:02 -0500
Subject: [PATCH 812/824] mesa: update to 21.1.7.

---
 srcpkgs/mesa/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 68d6a112681e..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.6
-revision=2
-wrksrc="mesa-${version}"
+version=21.1.7
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From f9fa2f9c9a8d8e3e1a9894bf79d3eccc18d39ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 17 Aug 2021 16:56:25 -0300
Subject: [PATCH 813/824] haproxy: update to 2.4.3.

Move to using DEBUG_CFLAGS when passing CFLAGS to makefile, otherwise we
override their required CFLAGS, such as -fwrapv.
---
 srcpkgs/haproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index c155186f100d..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
-revision=2
+version=2.4.3
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"

From 31232ddded030da3d9b826b549f69f93805e057a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:54:42 -0400
Subject: [PATCH 814/824] grpc: update to 1.39.1.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then

From cf20825bcef7ed44b0d43dd47ee4475fd06b060e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:55:19 -0400
Subject: [PATCH 815/824] python3-Pygments: update to 2.10.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From d1dbca1781b1d37869ca22f711964c8df4089027 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:56:50 -0400
Subject: [PATCH 816/824] python3-numpy: update to 1.21.2.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From b233ae640477ca07746b4a2da1e7199f1705bd04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 21:11:07 -0400
Subject: [PATCH 817/824] python3-pandas: update to 1.3.2.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 2bb0ec3cadba28ebb1db5e8ca2ebb689614afa62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:07:59 -0400
Subject: [PATCH 818/824] python3-pip: update to 21.2.4.

---
 .../python3-pip/patches/no-versioned-pip.patch | 18 +++++++++---------
 srcpkgs/python3-pip/template                   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index b07a3022fe14..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,12 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
 @@ -67,9 +67,7 @@
-     },
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 225ede1ccd09..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.3
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 

From 1fc7f2202ba57a1a1b052c8356f874c19cb158f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:24 -0400
Subject: [PATCH 819/824] python3-pytools: update to 2021.2.8.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE

From 2d075e8ae6b138c55dd95ff467b8bc3382b3a6f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:43 -0400
Subject: [PATCH 820/824] python3-ultrajson: update to 4.1.0.

---
 srcpkgs/python3-ultrajson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt

From 42eb9816c485382bb5ecb04400c0005ee185d80d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:25 -0400
Subject: [PATCH 821/824] qtutilities: update to 6.5.0.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 7fbe9e1b321b450374390d2fa41c708ee83c6007 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:39 -0400
Subject: [PATCH 822/824] tagparser: update to 10.1.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From a7db6e87006afbff2101e6be212d518a1fe59ebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:13:20 -0400
Subject: [PATCH 823/824] tageditor: update to 3.4.3.

libcgroup update version 2.o

checksum bz2 corrected

Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.

update to 2.0
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 .../libcgroup/patches/CVE-2018-14348.patch    |  12 +
 .../patches/api.c-fix-infinite-loop.patch     |  38 +
 srcpkgs/libcgroup/patches/musl-decls.patch    |   3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |   4 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 864 files changed, 4643 insertions(+), 5999 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..a1e7d86258cc 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,25 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
+<<<<<<< HEAD
 license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+=======
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+>>>>>>> 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +28,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index fbbbbe79bd3b..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.2
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 9d2e2588b4d7faa387fe16d81f8c80c412b38405 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 03:17:36 +0200
Subject: [PATCH 824/824] Revert "tageditor: update to 3.4.3."

This reverts commit a7db6e87006afbff2101e6be212d518a1fe59ebd.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 .../libcgroup/patches/CVE-2018-14348.patch    |  12 -
 .../patches/api.c-fix-infinite-loop.patch     |  38 -
 srcpkgs/libcgroup/patches/musl-decls.patch    |   3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |   4 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 864 files changed, 5999 insertions(+), 4643 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index a1e7d86258cc..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,25 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-<<<<<<< HEAD
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-=======
-license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
->>>>>>> 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -28,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 3223211 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 001/825] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From bf8ebed919a49d5fd815cc29d6de60b84e435283 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 27 Jul 2021 23:48:35 +0200
Subject: [PATCH 002/825] harfbuzz: update to 2.8.2.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..106a44ff3139 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From d1dc4cc5affe165ab385a92277e491ce3028f0ea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:52:23 +0200
Subject: [PATCH 003/825] openfortivpn: update to 1.17.0.

---
 srcpkgs/openfortivpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 

From 830b5cf6024b9c44811ae3b045f538501cf2036c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Jul 2021 21:54:25 +0200
Subject: [PATCH 004/825] openradtool: update to 0.13.8.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 14cf67008c2cf670ae69a87e6e0bd07375aa52c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:30:18 -0500
Subject: [PATCH 005/825] libxlsxwriter: update to 1.1.0.

---
 common/shlibs                  | 2 +-
 srcpkgs/libxlsxwriter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..04eefcdcbdd1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 35bc0ff0173134851df64250bcabdecdcb124282 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 15:29:52 -0500
Subject: [PATCH 006/825] sc-im: revbump for libxlsxwriter

---
 srcpkgs/sc-im/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 648a81d0aae80af6f2b348567be5386bdc2d9519 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Jul 2021 16:27:33 -0500
Subject: [PATCH 007/825] plantuml: update to 1.2021.9.

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh

From a7e520652eca96541cd717a1ec605648a18df24d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 28 Jul 2021 09:31:18 +0200
Subject: [PATCH 008/825] slack-desktop: update to 4.18.0

Closes: #32225 [via git-merge-pr]
---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes

From 24be999842fbe6eb37d10416728c57faf5df46c7 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Wed, 28 Jul 2021 18:31:25 +0700
Subject: [PATCH 009/825] flameshot: update to 0.10.1

---
 srcpkgs/flameshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9

From 75915800ba3c8a76fc0edb5824d3127883475cf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:44:58 +0200
Subject: [PATCH 010/825] bcc: update to 0.21.0.

---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..5fdf8be098b3 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"

From d0312f1bc0a7f8e60649f3ed3a86dbf60a390f05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:45:58 +0200
Subject: [PATCH 011/825] ipset: update to 7.14.

---
 srcpkgs/ipset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..51150121385d 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.14
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
 
 libipset_package() {
 	short_desc+=" - library files"

From c7ae4c23cc372799cd43739c9a08b907900bb360 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:47:29 +0200
Subject: [PATCH 012/825] nncp: update to 7.5.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..279d6235b763 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.5.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
 
 do_build() {
 	make

From 8f8fcf82af1b641a570d0e41f41bdb51223f6259 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:50:24 +0200
Subject: [PATCH 013/825] perl-PDF-API2: update to 2.041.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..6c50c810c944 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module

From ff36084ae0956c2b89926e9ccab1cf4cb5713ada Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:25 +0200
Subject: [PATCH 014/825] opam: update to 2.1.0.

---
 srcpkgs/opam/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 

From 4fa72959cafa46001b94b3be85499d789b098bfd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 14:53:50 +0200
Subject: [PATCH 015/825] linux5.10: update to 5.10.54.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..2832c9d04add 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.54
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From c6bd940d033d86a20dc645a956b4a77dc9173b9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Jul 2021 15:11:02 +0200
Subject: [PATCH 016/825] perl-PDF-API2: fix checksum.

---
 srcpkgs/perl-PDF-API2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 6c50c810c944..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537

From 0f2a4868ac92d8aa4482d989434fbea8d50bbc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 10:15:44 -0300
Subject: [PATCH 017/825] mdBook: update to 0.4.11.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..49e3264c70be 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.11
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
 
 post_install() {
 	vlicense LICENSE

From 5ae6df447f0f4723ee952c49f13bbbc1f79d4201 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 29 Jul 2021 18:33:03 +0200
Subject: [PATCH 018/825] LuaJIT: switch ppc patches to -p1 (fixes texlive
 build)

---
 .../patches/ppc/musl-ppc-secureplt.patch      | 12 ++---
 .../patches/ppc64/add-ppc64-support.patch     | 48 +++++++++----------
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |  4 +-
 srcpkgs/LuaJIT/template                       |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 

From 251975e3edaa84ca8014edf4a3b3dcae0f0d8502 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 28 Jul 2021 18:30:08 +0200
Subject: [PATCH 019/825] cozy: update to 1.0.4.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..b198300da9a4 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2

From b64df7fa72e80229b80380a6baf53461cb4cc2bc Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 28 Jul 2021 22:26:57 -0500
Subject: [PATCH 020/825] mesa: update to 21.1.6.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..8664f4d799bc 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.6
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 584935583d52e61a311c4011af754a0c058b5b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 08:28:17 +0200
Subject: [PATCH 021/825] postfix: update to 3.6.2.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..4dc1b9e5dad8 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
+version=3.6.2
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 2beff1801b36b5e34dbe54c3ee82623aeb79b0c2 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <dominic@dominic.io>
Date: Thu, 29 Jul 2021 10:17:20 +0100
Subject: [PATCH 022/825] clojure: update to 1.10.3.933.

---
 srcpkgs/clojure/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure

From ea798d1d800dcef686b456aa43d6bbb9ad9b9da2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:13:46 +0200
Subject: [PATCH 023/825] linux5.4: update to 5.4.136.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..4fd63332b5c9 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.136
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From de666e86ddf53c919cc017561be7ece833d0de45 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 29 Jul 2021 20:20:36 +0200
Subject: [PATCH 024/825] linux4.19: update to 4.19.199.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..a6e4f5a686b2 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.199
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4a99bde93b38c191d33fff12dd66485fb6cb7ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Jul 2021 16:00:15 -0300
Subject: [PATCH 025/825] yambar: fix launching with --backend=wayland.

Fixes: #32248.
---
 .../yambar/patches/0001-bar-fix-typo.patch    | 27 +++++++++++++++++++
 srcpkgs/yambar/template                       |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"

From d0113f34e8ec82bfd748c95c7c66d97be6bc542e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:07:32 +0200
Subject: [PATCH 026/825] isync: update to 1.4.3.

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From cd10a1791ec25645b7493324b05342feb334a3c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Jul 2021 14:09:51 +0200
Subject: [PATCH 027/825] xorg-server: update to 1.20.13.

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From c74c393167b226b8d5bbabb7cca7645ca8d247b8 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 30 Jul 2021 07:02:48 +0200
Subject: [PATCH 028/825] python3-pikepdf: update to 2.16.1.

---
 srcpkgs/python3-pikepdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From e3e508821f2bb1497d37e5f383475878c506c26e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:55:08 +0300
Subject: [PATCH 029/825] sublime-merge-bin: update to 2059.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 5641313fd32510cc7f521eb3aa78092249527b08 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:39:19 +0300
Subject: [PATCH 030/825] notcurses: update to 2.3.12.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..4b3563f65ffc 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.12
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 4876e6e11574697733cf09433c8c4c5e22c7158b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:28:22 +0300
Subject: [PATCH 031/825] skype: update to 8.74.0.152.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..d8e2f3a77606 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.74.0.152
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
 repository="nonfree"
 nostrip="yes"
 

From cf155a52e7e16d38b5a9f335fc9c6fa880c90459 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 30 Jul 2021 08:35:40 +0200
Subject: [PATCH 032/825] pp: update to 1.0.9.

---
 srcpkgs/pp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2dd28af4c82f5d7b459f388636dfde6c3b3cc820 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 27 Jul 2021 12:12:28 -0700
Subject: [PATCH 033/825] OpenRCT2: update to 0.3.4.1

---
 srcpkgs/OpenRCT2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..761da7f1e580 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
+version=0.3.4.1
 revision=1
 build_style=cmake
 configure_args="
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"

From 0aed85bdb32a1c29c8c5bd33f91b431620ae2486 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 21:05:15 +0300
Subject: [PATCH 034/825] mbedtls: update to 2.16.11.

---
 srcpkgs/mbedtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C

From 2c7ebe686e6539d65d3e64b4eb0c16b5e3544911 Mon Sep 17 00:00:00 2001
From: boson-at <boson@gmx.at>
Date: Fri, 30 Jul 2021 06:16:56 +0200
Subject: [PATCH 035/825] osm2pgsql: update to 1.5.1.

---
 srcpkgs/osm2pgsql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e

From 894908b71b0342b1d3fa3709a0010cd5a2130a81 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:44:40 +0300
Subject: [PATCH 036/825] qalculate: update to 3.20.1

---
 common/shlibs              | 2 +-
 srcpkgs/qalculate/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 04eefcdcbdd1..da24f1de5810 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2996,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..ac326495fa31 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.19.0
+version=3.20.1
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"

From f0478f19b9c72c29ef01de96496177a9d2bc95b7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:39:18 +0300
Subject: [PATCH 037/825] plasma-workspace: revbump for libqalculate.so.22

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..fa84666b06fb 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,10 +1,10 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.22.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel

From 4aedc78b57437bccebfb2655ad2da8538168ad92 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 15:46:26 +0300
Subject: [PATCH 038/825] qalculate-gtk: update to 3.20.1

---
 srcpkgs/qalculate-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..f71c085f5e8a 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136

From 730d52125fc8942128d1e15c5cd72bc97eccb141 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 29 Jul 2021 16:21:08 +0300
Subject: [PATCH 039/825] New package: qalculate-qt-3.20.1

---
 srcpkgs/qalculate-gtk/template |  1 +
 srcpkgs/qalculate-qt/template  | 16 ++++++++++++++++
 srcpkgs/qalculate/template     |  1 +
 3 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/qalculate-qt/template

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index f71c085f5e8a..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
 version=3.20.1
 revision=1
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ac326495fa31..4d9e490bf26d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,5 +1,6 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
 revision=1

From b83d25247b20e2063d28c05516882c1dea443938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Jul 2021 17:06:48 -0300
Subject: [PATCH 040/825] util-linux: backport fix for su(1).

Since trusting PAM_RUSER is left to administrators, make sure it can be
trusted if necessary.
---
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch | 47 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch

diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..41bffc545884 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From 7bccf7fad7e63a457812157856c53e95bf5c606c Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 30 Jul 2021 17:41:13 -0600
Subject: [PATCH 041/825] mu: update to 1.6.1

---
 srcpkgs/mu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 6e5e816b5ca9..36d67ef65cba 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -1,16 +1,16 @@
 # Template file for 'mu'
 pkgname=mu
-version=1.6.0
+version=1.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://www.djcbsoftware.nl/code/mu/"
 distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
 
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" emacs"

From 00a8dd3e694f8b884b0a1c132f441765228d19fa Mon Sep 17 00:00:00 2001
From: jailbird777 <jailbird@fdf.net>
Date: Mon, 26 Jul 2021 19:11:45 -0500
Subject: [PATCH 042/825] New package: dnsdist-1.6.0

---
 srcpkgs/dnsdist/files/dnsdist/run |  4 ++++
 srcpkgs/dnsdist/template          | 36 +++++++++++++++++++++++++++++++
 srcpkgs/dnsdist/update            |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update

diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"

From 2e448c405e2cce6c4a8089cca243d791df0d6b49 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 27 Jul 2021 11:36:40 +0200
Subject: [PATCH 043/825] libX11: patch for new symbols

Apply upstream merge request to handle the new _EVDEVK xorgproto symbols,
so that xkbcomp does not generate hundreds of warnings.
See https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79
---
 .../handle_new_xorgproto_symbols.patch        | 42 +++++++++++++++++++
 srcpkgs/libX11/template                       |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch

diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From 476583c474bc04e927239615104130bb6fcb3a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Fri, 23 Jul 2021 12:24:43 +0000
Subject: [PATCH 044/825] dnscrypt-proxy: fix logging (redirect stderr to
 svlogd).

---
 srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run | 1 +
 srcpkgs/dnscrypt-proxy/template                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"

From 53c7116b9a63e71269449b66415807de0ed0f6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gerdau?= <bjoerngerdau@gmx.de>
Date: Wed, 21 Jul 2021 22:21:23 +0200
Subject: [PATCH 045/825] kubernetes: update to 1.21.3.

---
 srcpkgs/kubernetes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..08d2f27b3859 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"

From 805cb4f9eb1b8ba71c64c38ef85d8ac43d99cf4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 31 Jul 2021 12:05:35 +0700
Subject: [PATCH 046/825] cryfs: build with NDEBUG defined

Close: #32266
---
 srcpkgs/cryfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..6d8f855a80af 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel

From 58c88407e18253ac9d27fe208e1dc6843ca59b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+github@mayonnaise.net>
Date: Wed, 28 Jul 2021 22:15:51 +0000
Subject: [PATCH 047/825] tailscale: update to 1.12.1.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE

From 1031b03e01d8e1b82244b88cbd317895651c2c3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Jul 2021 16:56:57 +0200
Subject: [PATCH 048/825] knot-resolver: update to 5.4.0.

---
 srcpkgs/knot-resolver/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..b07a400a3a02 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
+version=5.4.0
 revision=1
 build_style=meson
 configure_args="
@@ -8,17 +8,18 @@ configure_args="
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From f9e2bddbcb5f3cc2ad3366c55ae9017e8b6854a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 31 Jul 2021 14:31:05 +0200
Subject: [PATCH 049/825] monit: update to 5.28.1.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap

From 26708d26b89093c61ec10887f0c38382fcf16ddd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 31 Jul 2021 16:49:34 -0500
Subject: [PATCH 050/825] hivex: update to 1.3.20.

---
 srcpkgs/hivex/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..1ed578d92e17 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.20
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
 nocross=yes

From 1f2aa9d964d19080e49d9a4a4ca41e91269fb554 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 31 Jul 2021 22:40:39 +0200
Subject: [PATCH 051/825] webkit2gtk: add more BE fixes

---
 .../patches/be-imagebufferbackend.patch       | 214 ++++++++++++++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++++
 2 files changed, 262 insertions(+)
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch

diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2

From fe9051867433b91e17128ac090c3f6fa8cb642aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:57 +0200
Subject: [PATCH 052/825] bluedevil: update to 5.22.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 4182e1a5ba8b0c7219cb689e7ff2e240efc14f04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:23:59 +0200
Subject: [PATCH 053/825] breeze-gtk: update to 5.22.4.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 297a08aceddc5530b360214508f304572c515c81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:06 +0200
Subject: [PATCH 054/825] breeze: update to 5.22.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 065852826ab37f6dc77c4459158ad107978be922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:07 +0200
Subject: [PATCH 055/825] kactivitymanagerd: update to 5.22.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce

From 1810152e1f56df634ec6ae3d7e0febe0c9d5bad1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:09 +0200
Subject: [PATCH 056/825] kde-cli-tools: update to 5.22.4.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 820bddb8cc52202608785b2db5aabdd0f930d862 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:10 +0200
Subject: [PATCH 057/825] kde-gtk-config5: update to 5.22.4.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c18bf9893294ea60ca77fd5f8091a254873fd1d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:12 +0200
Subject: [PATCH 058/825] kdecoration: update to 5.22.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 0a88170a2ae49b69e48816588f695e6dd2820336 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:13 +0200
Subject: [PATCH 059/825] kdeplasma-addons5: update to 5.22.4.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 2b7dd6ecc4075a5601f02cc9c4a89e87a50f782b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:14 +0200
Subject: [PATCH 060/825] kgamma5: update to 5.22.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From e17b6f51d05bb5c53761e6fdd7ef65297d51d172 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:16 +0200
Subject: [PATCH 061/825] khotkeys: update to 5.22.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 3e67029160dfb48ed668c2e1601783bf89816da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:18 +0200
Subject: [PATCH 062/825] kinfocenter: update to 5.22.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 32235fde4742bf035d801c9746f69e0209552901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:19 +0200
Subject: [PATCH 063/825] kmenuedit: update to 5.22.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0

From 79997e03280ecf8d42125336f8a84daf9dc5f43a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:21 +0200
Subject: [PATCH 064/825] kscreen: update to 5.22.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f6294bce6eb9994211ce9e182650009f9aa11342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:22 +0200
Subject: [PATCH 065/825] kscreenlocker: update to 5.22.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 18e1026487399c3a7a2ce79ebd323fa7e9dff88a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:24 +0200
Subject: [PATCH 066/825] ksshaskpass: update to 5.22.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 6fc37d84520d82cfe038da0104f5bf686f0dd5cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:25 +0200
Subject: [PATCH 067/825] ksystemstats: update to 5.22.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5

From 5063d1ccd837452ece28451f0576a3e1f5732dd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:27 +0200
Subject: [PATCH 068/825] kwallet-pam: update to 5.22.4.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2

From 4420f4e96772b059ca1c048c75a707ecb999faa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:28 +0200
Subject: [PATCH 069/825] kwayland-integration: update to 5.22.4.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e

From 4b5d44cc010f11f556c0d2f986e13840f8e58d92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:29 +0200
Subject: [PATCH 070/825] kwayland-server: update to 5.22.4.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 873c60b97358cc9c08bbdf7e8362b80ad29a3db1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:32 +0200
Subject: [PATCH 071/825] kwin: update to 5.22.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"

From 9730118279df11c3ad8b96453db3aa6c302ce905 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:33 +0200
Subject: [PATCH 072/825] kwrited: update to 5.22.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5

From 55f428cce7515cc770eea2afbd4eb38ab16f5b24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:34 +0200
Subject: [PATCH 073/825] layer-shell-qt: update to 5.22.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 84946bf3d38186226c8b81344d95766f85ba6524 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:36 +0200
Subject: [PATCH 074/825] libkscreen: update to 5.22.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 5085c2ec9257a08225b717d1e269ab37869da23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:37 +0200
Subject: [PATCH 075/825] libksysguard: update to 5.22.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 

From 71de4a03f8957eac88eba1c4ae5a951c6d14dca1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:39 +0200
Subject: [PATCH 076/825] milou: update to 5.22.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 3dcb3abae554c9a06305c53bc35c5385856e3e5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:41 +0200
Subject: [PATCH 077/825] oxygen: update to 5.22.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc

From 825dc137b137b77093966e2cbd14c5073dd73cb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:42 +0200
Subject: [PATCH 078/825] plasma-browser-integration: update to 5.22.4.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From ee40aaeb90ea53724c7294666882c40e99722dbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:46 +0200
Subject: [PATCH 079/825] plasma-desktop: update to 5.22.4.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3

From 17e9e849ea0e6d943d92397aeb10d3a896950175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:47 +0200
Subject: [PATCH 080/825] plasma-disks: update to 5.22.4.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909

From 521bfe3f92aea3574ca1e0b1a0ffc0c87447dd00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:49 +0200
Subject: [PATCH 081/825] plasma-firewall: update to 5.22.4.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0

From d8dfb12795b9285894034050838d4a72a3ace9ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:50 +0200
Subject: [PATCH 082/825] plasma-integration: update to 5.22.4.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467

From 0f0aaa92d4b504cde54e6fd1bfe958af1effc927 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:52 +0200
Subject: [PATCH 083/825] plasma-nm: update to 5.22.4.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5b7986e96346b51e8d4174a9dfc70257e3d0a6ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:53 +0200
Subject: [PATCH 084/825] plasma-pa: update to 5.22.4.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 700491832bd8de34062a175405b5ffef4f65220f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:55 +0200
Subject: [PATCH 085/825] plasma-sdk: update to 5.22.4.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 13fd1f8b3ab81f3a914635556bd5d57fe08d0c9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:56 +0200
Subject: [PATCH 086/825] plasma-systemmonitor: update to 5.22.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be

From 6963498c213b686efecea6ff90f5bf17994a7acf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:58 +0200
Subject: [PATCH 087/825] plasma-thunderbolt: update to 5.22.4.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services

From 75173d470aff372c2a12b990fcfa08d7358e7720 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:24:59 +0200
Subject: [PATCH 088/825] plasma-vault: update to 5.22.4.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 1b19a5acce520117cdc1efa3a75860e7fe3e40fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:08 +0200
Subject: [PATCH 089/825] plasma-workspace-wallpapers: update to 5.22.4.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29

From 62e4fe155ea27782c39682c8cdeac0377a343e67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:11 +0200
Subject: [PATCH 090/825] plasma-workspace: update to 5.22.4.

---
 srcpkgs/plasma-workspace/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index fa84666b06fb..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
-revision=2
+version=5.22.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"

From b9bddaf4fc50f89a4abe42162a3d75a9f4353e09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:12 +0200
Subject: [PATCH 091/825] polkit-kde-agent: update to 5.22.4.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f

From 958ad12c4c1086f4c9261f620cbb5701fba03821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:15 +0200
Subject: [PATCH 092/825] powerdevil: update to 5.22.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c

From 355ae4cb66d20393c952b25861521ce849dce34c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:16 +0200
Subject: [PATCH 093/825] sddm-kcm: update to 5.22.4.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022

From 1689a7936293ec4f122162aad2a822be190dedf8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:17 +0200
Subject: [PATCH 094/825] systemsettings: update to 5.22.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa

From 759bf77cc98e1609c69ab8930be71ab4a8bd5cfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Jul 2021 20:25:19 +0200
Subject: [PATCH 095/825] xdg-desktop-portal-kde: update to 5.22.4.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6

From 578e8752ad5822e14608fd754cb628aa2f8623d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:09 -0400
Subject: [PATCH 096/825] python3-aioredis: update to 2.0.0.

---
 srcpkgs/python3-aioredis/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE

From 87dd6c58f9b89ed34e4dc2a90e39cc711167ff61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:39:49 -0400
Subject: [PATCH 097/825] python3-flit_core: update to 3.3.0.

---
 srcpkgs/python3-flit_core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE

From 191519639e496b89c0a9632d5b8c738054f61aa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:44:39 -0400
Subject: [PATCH 098/825] python3-pip: update to 21.2.2.

---
 .../patches/no-versioned-pip.patch            | 19 ++++++++++---------
 srcpkgs/python3-pip/template                  |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..b07a3022fe14 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,11 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+@@ -67,9 +67,7 @@
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..3e800139d4da 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.2
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
 # Tests have unpackaged dependencies
 make_check=no
 

From 4ecf8b8a4e5f6791b0d38896c37b426c8c8a8fa8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 31 Jul 2021 17:55:47 -0400
Subject: [PATCH 099/825] python3-tifffile: update to 2021.7.30.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..0e9e467e1564 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.7.30
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
 # Tests require unpackaged fsspec
 make_check=no
 

From 98de8e3b3105dd94ab6c3c2fe071e3503547d031 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 28 Jul 2021 20:04:41 +0300
Subject: [PATCH 100/825] qutebrowser: update to 2.3.1

Closes: #32236 [via git-merge-pr]
---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From 755ebf64fa93f646b9444906272f0b944b3a8713 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 1 Aug 2021 03:03:31 +0200
Subject: [PATCH 101/825] kubernetes: fix build

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 08d2f27b3859..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh

From f1352aeba3d93eb58235e06091768ced9dee31d0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:45:54 +0200
Subject: [PATCH 102/825] wine: update to 6.14.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..30be01e169b2 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.14/dlls/dnsapi/libresolv.c
++++ b/wine-6.14/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..bb2fa789c7e7 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.14
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
+ 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 82d9b2bf941dcc859ac3414cb5ceac4768e7f4e9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:47:38 +0200
Subject: [PATCH 103/825] wine-mono: update to 6.3.0.

---
 srcpkgs/wine-mono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 3436c69dd25a5964cdf9b666e9d1a2653b5be4fd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:50:34 +0200
Subject: [PATCH 104/825] linux5.4: update to 5.4.137.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 4fd63332b5c9..807b6b49c848 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.136
+version=5.4.137
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4322dd36bf86b82d410fb2d4df196d1f3b78819aa9dd78b555703bcbf49bad16
+checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 846a9d9602b827a11a539dfe9463d80cd019cd80 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 1 Aug 2021 09:53:39 +0200
Subject: [PATCH 105/825] linux4.19: update to 4.19.200.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index a6e4f5a686b2..1962af9c6030 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.199
+version=4.19.200
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=3d7babf8d0c6d855b7fd94e831c745e88921798b2366e21e3dece63162e42a9a
+checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 658962505a222a3e828777a850caddd32900e62c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:46:12 +0200
Subject: [PATCH 106/825] python3-pyinfra: update to 1.4.11.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..b7c5bebb3e56 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.11
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 7b2ab0e7fb9c1022d0ac7c15a0d13dde9ac0cc17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:48:08 +0200
Subject: [PATCH 107/825] sleuthkit: update to 4.11.0.

---
 srcpkgs/sleuthkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

From 63599059d0f13b19b36b3e4805974fc86f7c3d33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 Aug 2021 16:50:43 +0200
Subject: [PATCH 108/825] sbcl: update to 2.1.7.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 6b47f1aff805e83d69d7cd981bd71989db748ede Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 16:59:09 +0200
Subject: [PATCH 109/825] hugo: update to 0.86.1.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..03cdeb450eae 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.86.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
 
 post_install() {
 	vdoc README.md

From 80539eb4856eb564986a59837ab587b18236fc8e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 1 Aug 2021 17:03:26 +0200
Subject: [PATCH 110/825] freeplane: update to 1.9.7.

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From 4c15a7022daffc1de7e98bb12ef93d4bfe196f71 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 1 Aug 2021 19:54:29 +0200
Subject: [PATCH 111/825] shfmt: update to 3.3.1.

Closes: #32290 [via git-merge-pr]
---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 8180bbd08443aa4acd6a15c5c6408239afb27112 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:30:05 +0200
Subject: [PATCH 112/825] sfeed: update to 0.9.25.

Closes: #32287 [via git-merge-pr]
---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..9f3d23098319 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
 
 post_install() {
 	vlicense LICENSE

From 7b14cce382cf4eba02064a324ce758999122e407 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 1 Aug 2021 00:44:56 +0300
Subject: [PATCH 113/825] mousepad: update to 0.5.6.

Also:
- replace gtksourceview-devel with gtksourceview4-devel in makedepends.

Closes: #32277 [via git-merge-pr]
---
 srcpkgs/mousepad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f

From 01f6ee69649b02cfe46f5d7850d3f3a8d9b62e80 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 31 Jul 2021 19:23:50 +0200
Subject: [PATCH 114/825] s: update to 0.5.16.

Closes: #32271 [via git-merge-pr]
---
 srcpkgs/s/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE

From 0af2b4c515fbd6e58113fadf2f0c6091f569416b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 30 Jul 2021 20:50:40 +0300
Subject: [PATCH 115/825] python3-distro: update to 1.6.0.

Also:
- add checkdepends to enable tests.

Closes: #32260 [via git-merge-pr]
---
 srcpkgs/python3-distro/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424

From dc8f929dfbc90fd31717cc1df8be050610a9b99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 29 Jul 2021 18:06:38 +0200
Subject: [PATCH 116/825] tickr: update to 0.7.1.

Closes: #32247 [via git-merge-pr]
---
 srcpkgs/tickr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;

From 70d8435c0f0c224e1dc9ba096cd928faf0dc51e8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:47:34 +0200
Subject: [PATCH 117/825] python3-pyrsistent: update to 0.18

---
 srcpkgs/python3-pyrsistent/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {

From 7ba6e9a9a3934f9cb326e7c7060693c2f6cbb422 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:50:00 +0200
Subject: [PATCH 118/825] python3-jupyterlab_server: update to 2.6.1

---
 srcpkgs/python3-jupyterlab_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 

From 30aa5752c8009815df56229c6523a3d59fbf99b0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:51:27 +0200
Subject: [PATCH 119/825] python3-jupyter_server: update to 1.10.1

---
 srcpkgs/python3-jupyter_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 

From 4d9261d3aa412f7f31e5f61ecb288d1304ff3be7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:52:59 +0200
Subject: [PATCH 120/825] python3-json5: update to 0.9.6

---
 srcpkgs/python3-json5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c

From 05d3902453902619fb1bc887e99df60858368a95 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:54:15 +0200
Subject: [PATCH 121/825] python3-anyio: update to 3.3.0

---
 srcpkgs/python3-anyio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {

From 8b968948196d1d8b308d59f1750d5d37c2e78087 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 28 Jul 2021 17:55:45 +0200
Subject: [PATCH 122/825] jupyterlab: update to 3.1.0, add deps

Closes: #32235 [via git-merge-pr]
---
 srcpkgs/jupyterlab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 

From be6ed42fb8fe6b2747a97b5c28883ef55109a610 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:22:05 +0200
Subject: [PATCH 123/825] xeyes: update to 1.2.0.

---
 srcpkgs/xeyes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..64ff5042d9d0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,6 +1,6 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING

From 3d2469e246a4bd6ac2e471958f16eea5764877b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 14:28:00 +0200
Subject: [PATCH 124/825] re2c: update to 2.2.

---
 srcpkgs/re2c/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda

From 7b6e26ca542d6d307a6fb85785b648104bc21568 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Aug 2021 16:34:37 +0200
Subject: [PATCH 125/825] xwd: update to 1.0.8.

Adopt.
---
 srcpkgs/xwd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING

From 2942652d4ce85856fcccb6318d23f139cea783a5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 Aug 2021 16:31:23 +0200
Subject: [PATCH 126/825] icdiff: update to 2.0.3.

---
 srcpkgs/icdiff/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..3af6dfdcd074 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.3
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }

From a6391eb478911a2ce0fc6cb915fe85bc5c1ac403 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 19:58:04 +0200
Subject: [PATCH 127/825] libvirt: update to 7.6.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 6ed854b7128a7db84bce534376afae41923dc784 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:00:31 +0200
Subject: [PATCH 128/825] libvirt-python3: update to 7.6.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e

From 62a3709b1bc9e11d1d999f042cbc590ab2b6d695 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 2 Aug 2021 20:04:19 +0200
Subject: [PATCH 129/825] xeyes: add libXi-devel to makedepends

---
 srcpkgs/xeyes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 64ff5042d9d0..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"

From 7f3c99b517e78f6f95b15adbc1421942c842bb18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 19:37:54 +0200
Subject: [PATCH 130/825] tg_owt: rebuild to fix a segfault

I'm not sure what exactly caused it or what causes it,
the segfault did not happen in gdb,
instead telegram just exited normally
---
 srcpkgs/tg_owt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9

From 4e76ca0b13e87610b180d5b31312f19bd610a3b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:01:58 +0200
Subject: [PATCH 131/825] telegram-desktop: update to 2.9.0.

closes #32111
---
 .../0003-remove-redundant-extern-c.patch      | 28 -------------------
 srcpkgs/telegram-desktop/template             |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch

diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 42950e423afdf403db04b4df9ec0588f75b3ef00 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 22:05:48 +0200
Subject: [PATCH 132/825] musl: backport patches to fix pthread_cond_wait with
 PI mutex

https://github.com/pulseaudio/pulseaudio/blob/master/src/pulsecore/mutex-posix.c#L55
https://github.com/pulseaudio/pulseaudio/blob/master/src/pulse/thread-mainloop.c#L118

https://github.com/pulseaudio/pulseaudio/commit/413a8f8917256ef44a58fc8519bcc93644423373

pulseaudio uses a prio-inheriting mutex since the above revision
that is paised with a condition variable; the behavior of this
was broken in musl until the above patches, which would result
in pulseaudio deadlocking with gstreamer pulsesink (most often
with webkit) and possibly other things.

Fixes https://github.com/void-linux/void-packages/issues/15631
---
 .../musl/patches/fix-pi-mutex-cond-1.patch    | 56 +++++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-2.patch    | 48 ++++++++++++++++
 .../musl/patches/fix-pi-mutex-cond-3.patch    | 28 ++++++++++
 srcpkgs/musl/template                         |  2 +-
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch

diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure

From 526a182d9bdef4401c176e47ace0133356d2732a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 31 Jul 2021 02:14:55 -0300
Subject: [PATCH 133/825] bcc: (actually) update to 0.21.0.

The unversioned file name means we can accidentally fool the distfiles
cache, so the package was built with the wrong distfiles.

We avoid this issue in the future by renaming the file to one that
contains the version.
---
 srcpkgs/bcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5fdf8be098b3..5a3e66c86c5d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
+checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2b855e52fcc047dd9eb994688931c0f2b913da81 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:53:58 +0200
Subject: [PATCH 134/825] scrot: update to 1.6.

---
 srcpkgs/scrot/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh

From bb8b54a3e3efc51480c6dab404451e2738b38c77 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 31 Jul 2021 10:52:54 +0200
Subject: [PATCH 135/825] libmbim: update to 1.26.0.

---
 srcpkgs/libmbim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"

From e9d8d473ecad40e9d28c0997d691a108f5e995ae Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 25 Jul 2021 11:15:46 +0200
Subject: [PATCH 136/825] New package: shiori-1.5.0

---
 srcpkgs/shiori/files/shiori/run |  4 ++++
 srcpkgs/shiori/template         | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template

diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}

From 18c5ca6f8beb6a38f6c33af60e1951a29e92fc5e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 2 Aug 2021 23:20:05 +0200
Subject: [PATCH 137/825] bcc: use an updated libbpf to fix build on 32-bit
 systems

---
 srcpkgs/bcc/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 5a3e66c86c5d..c2b7a65c19fd 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=2
+revision=3
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
-checksum=5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"

From 12f79a6f3336a2e177c02964fcd245bafd8d1e34 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 15 Aug 2020 20:57:51 +1000
Subject: [PATCH 138/825] New package : python3-RPi.GPIO-0.7.0

---
 srcpkgs/python3-RPi.GPIO/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-RPi.GPIO/template

diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}

From 8822f15cbcd902c3e5ec7c755817dd77e5b40227 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 27 Jul 2021 08:38:10 +0200
Subject: [PATCH 139/825] sslh: add patch to work with libconfig 1.7.3

---
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 2 files changed, 713 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch

diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"

From 5c81bc718b3870c4d24fa28614ee7b5d00d21866 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:38:13 +0300
Subject: [PATCH 140/825] perl-Test-Needs: update to 0.002009.

---
 srcpkgs/perl-Test-Needs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3

From bfed1bb164fed35c7e5233389f5a0ad79860a502 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 12:24:26 +0300
Subject: [PATCH 141/825] perl-URI: update to 5.09.

---
 srcpkgs/perl-URI/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a

From 74fb046938787094372ec43b172c780cc43fe513 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 13:32:02 +0200
Subject: [PATCH 142/825] sfeed_curses: update to 0.9.13.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..148f3d67f824 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=0.9.13
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
 
 post_install() {
 	vlicense LICENSE

From abd3eb5932a75b982333318bc931cfac3b22b2a4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 1 Aug 2021 09:57:54 +0200
Subject: [PATCH 143/825] mkvtoolnix: update to 60.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0875991a872f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
+version=60.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 8492465cca7202e829fd4fa2094305176d4b82f6 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 1 Aug 2021 16:10:52 +1000
Subject: [PATCH 144/825] saml2aws: update to 2.32.0

---
 srcpkgs/saml2aws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md

From ee2e4b417df573312513c4b029ffe0ded5424a16 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 31 Jul 2021 14:49:30 -0300
Subject: [PATCH 145/825] imlib2: update to 1.7.2.

---
 srcpkgs/imlib2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING

From d79d51133a7795c30ce91c1193d7a69ef5acb05a Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Mon, 2 Aug 2021 11:47:58 -0500
Subject: [PATCH 146/825] protonvpn-cli: update to 2.2.11.

---
 srcpkgs/protonvpn-cli/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..c9a3c784ace6 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,8 +1,8 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
+version=2.2.11
 revision=1
-wrksrc="linux-cli-${version}"
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
@@ -11,5 +11,6 @@ short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks

From 4c65424e746058006221c2cf1b1e804eb9f29745 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Aug 2021 13:45:28 +0200
Subject: [PATCH 147/825] dbeaver: update to 21.1.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..b5ae64ae7d74 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
 nopie=true
 
 do_build() {

From 7709c4a46e3bd26c0c3dca7c3eef66779e95a56f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Fri, 30 Jul 2021 11:55:26 +0300
Subject: [PATCH 148/825] emptty: update to 0.6.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 76259b34714cd32f6b3af9126e82866244143fc4 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Fri, 30 Jul 2021 20:14:00 -0400
Subject: [PATCH 149/825] synapse: update to 1.39.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..b45f32817bdf 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.39.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From eebd0dd6ef328be609125345f6b68d78a8da8753 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Jul 2021 18:35:41 +0300
Subject: [PATCH 150/825] btrfs-progs: update to 5.13.1

---
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch | 56 -------------------
 srcpkgs/btrfs-progs/template                  |  6 +-
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch

diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

From bb937e8516359f896d906a54eb5f189974ee367a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 21 Jul 2021 14:11:56 +0200
Subject: [PATCH 151/825] rpi-imager: update to 1.6.2.

---
 srcpkgs/rpi-imager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

From 8158b933384153d954c94578c8d3c4a0f600ad96 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Wed, 21 Jul 2021 11:59:41 -0700
Subject: [PATCH 152/825] zola: update to 0.14.0

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From da39ce8d105103e65958ba2d1f541472f2f0de1b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 2 Aug 2021 17:52:41 +0300
Subject: [PATCH 153/825] dialog: update to 1.3.20210621.

---
 srcpkgs/dialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib

From a286d255e4c156b37ca823fe5d3db29b062e363f Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Thu, 29 Jul 2021 16:04:06 +0600
Subject: [PATCH 154/825] crun: update to 0.21.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From f45e582f9ae21b82224ec627bbc3355d06d28f4c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 29 Jul 2021 19:51:53 +0000
Subject: [PATCH 155/825] strace: update to 5.13.

---
 srcpkgs/strace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"

From 8e78b7ffc1c6c47e04198edbd95ab57e2d8cf8af Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 1 Aug 2021 11:52:23 +0300
Subject: [PATCH 156/825] vc: update to 1.4.2.

---
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch | 31 +++++++++++++++++++
 srcpkgs/vc/template                           |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch

diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE

From 87f90aaaaaf0b8aeb77de6a9434f98868f0dbb15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:43:50 +0200
Subject: [PATCH 157/825] neatvi: update to 09.

---
 srcpkgs/neatvi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex

From a63d20a6891426469e0c2f5f553a07cc0fa8dda8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:44:49 +0200
Subject: [PATCH 158/825] skaffold: update to 1.29.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..663f97e1f5f0 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.29.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046

From 751bab7ffff3012dcf4bd87f8b0f86263a5c8ce0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:45:35 +0200
Subject: [PATCH 159/825] byacc: update to 20210802.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..db54998f0f25 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210802
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 12130e2bf2e4e0c2a624fec021272bf4552c7a5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:46:11 +0200
Subject: [PATCH 160/825] minify: update to 2.9.21.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE

From ce36ce06f777aba0413bf268523fe8d0064a37b9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:49:15 +0200
Subject: [PATCH 161/825] stress-ng: update to 0.13.00.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd

From d946fa51e2e5208dc9fc3c82854cb07cbd6a7d86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:53:16 +0200
Subject: [PATCH 162/825] crawl: update to 0.27.0.

---
 srcpkgs/crawl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 66e60f98d0f9acec997eed53e4db6c10dc8e5ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 3 Aug 2021 10:55:47 +0200
Subject: [PATCH 163/825] crawl-tiles: update to 0.27.0.

---
 srcpkgs/crawl-tiles/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {

From 7a7362867fee3361e82a713d53f421d620ce8f40 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 14:52:47 +0200
Subject: [PATCH 164/825] syncthing: update to 1.18.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \

From 5054eeb32fd32539b2841303467316c079f219b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:41:20 -0400
Subject: [PATCH 165/825] python3-scipy: update to 1.7.1.

---
 srcpkgs/python3-scipy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 

From bbfb3428f692c64c9023ba0ae2c4273dd3e4013e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 2 Aug 2021 16:42:34 -0400
Subject: [PATCH 166/825] python3-ipython: update to 7.26.0.

---
 srcpkgs/python3-ipython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 9f8c9e8acad8cde2c0f61481fee1ea36ef7afc3c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 3 Aug 2021 17:42:05 +0200
Subject: [PATCH 167/825] warzone2100: update to 4.1.2.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..d878605ff26a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.2
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 1b02a7875d62626de377db501d29e03a5460e3d3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 18:02:07 +0200
Subject: [PATCH 168/825] restic: update to 0.12.1.

---
 srcpkgs/restic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE

From b22b739d19e707b0801065ca0c813a3f4ea9bbe5 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 3 Aug 2021 13:50:11 +0200
Subject: [PATCH 169/825] vips: update to 8.11.2.

---
 srcpkgs/vips/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"

From b6a3541047198e846495fe5800601ce71d5a9307 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 3 Aug 2021 13:06:35 +0200
Subject: [PATCH 170/825] google-chrome: update to 92.0.4515.131

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 4f0f4ff21a2e9fccb65935d9dc8d6b34491db428 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:21 +0200
Subject: [PATCH 171/825] knot: update to 3.1.0.

---
 common/shlibs         | 4 ++--
 srcpkgs/knot/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index da24f1de5810..f768a637aed5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3678,9 +3678,9 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
 libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..2188e92dac8b 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From c705c309f06982619f4cf87eee6131b5aee801f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 Aug 2021 18:23:57 +0200
Subject: [PATCH 172/825] knot-resolver: rebuild against knot-3.1.0_1

---
 srcpkgs/knot-resolver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b07a400a3a02..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,7 +1,7 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
 version=5.4.0
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled

From 3af8ef01c784b1ec70b76589ed95c856e1b1e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 3 Aug 2021 20:36:16 +0200
Subject: [PATCH 173/825] firefox-i18n: update to 90.0.1.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..d1526dfa7ba1 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
+ 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
+ a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
+ 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
+ ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
+ 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
+ d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
+ ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
+ 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
+ ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
+ 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
+ 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
+ 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
+ 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
+ bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
+ 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
+ e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
+ cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
+ 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
+ df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
+ 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
+ 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
+ cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
+ dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
+ 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
+ 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
+ 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
+ c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
+ b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
+ 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
+ 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
+ b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
+ 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
+ e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
+ 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
+ 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
+ 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
+ e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
+ 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
+ befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
+ e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
+ 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
+ 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
+ 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
+ ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
+ d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
+ f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
+ 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
+ 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
+ db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
+ a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
+ d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
+ fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
+ c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
+ a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
+ a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
+ c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
+ b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
+ 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
+ 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
+ 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
+ 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
+ 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
+ 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
+ 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
+ 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
+ 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
+ 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
+ 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
+ a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
+ b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
+ 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
+ a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
+ a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
+ cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
+ dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
+ 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
+ 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
+ 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
+ b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
+ 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
+ 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
+ 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
+ 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
+ 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
+ c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
+ f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
+ e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
+ e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
+ 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
+ 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
+ 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
+ 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
+ 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
+ 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
+ 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"

From eb18dda697776e74fb93e4d0903ea24a6dff83fa Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 2 Aug 2021 09:09:50 +0300
Subject: [PATCH 174/825] khal: update to 0.10.4.

---
 srcpkgs/khal/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \

From c953a74395992461d1273e5463849a873109a39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 3 Aug 2021 18:29:40 -0300
Subject: [PATCH 175/825] util-linux: backport sulogin(8) fix.

sulogin wasn't actually logging in, making single user mode useless.

Reported by kciN on IRC.
---
 .../patches/0001-sulogin-fix-getpasswd.patch  | 26 +++++++++++++++++++
 srcpkgs/util-linux/template                   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch

diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 41bffc545884..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin

From aa3de6857265bff30ec3dba020c880763fba7b18 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 31 Jul 2021 19:57:01 +0200
Subject: [PATCH 176/825] python3-astroid: update to 2.6.5, adopt

---
 srcpkgs/python3-astroid/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7

From 041a71e4789318e861d934139d62ee4da01420d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Aug 2021 00:10:46 +0200
Subject: [PATCH 177/825] pylint: update to 2.9.6, adopt

---
 srcpkgs/pylint/patches/fix-tests.patch | 13 +++++++++++++
 srcpkgs/pylint/template                | 24 ++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch

diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {

From b589ff1e465f2798060023dc68e788763d988774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:04:17 -0300
Subject: [PATCH 178/825] New package: linux-base-2021.07.21

Base package to be used as dependency for linux and linux-lts. This way
they can share the same code and users who want to stick with a given
kernel version can just install that one and linux-base instead of
needing the linux or linux-lts meta and ignorepkg dances.
---
 srcpkgs/linux-base/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/linux-base/template

diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac

From b6dc0b0edea9c0a2863c38b3c8524b76ce9f4030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:31 -0300
Subject: [PATCH 179/825] linux: update to 5.13.

Also move to using linux-base.
---
 srcpkgs/linux/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From 64b3e1c06829131862063aa92a77d33874c2b2f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Jul 2021 17:06:46 -0300
Subject: [PATCH 180/825] linux-lts: update to 5.10.

Also move to using linux-base and xlint.
---
 srcpkgs/linux-lts/template | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }

From a524266ac3a6da955dac28ceb353dccc712f1815 Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:43:30 -0700
Subject: [PATCH 181/825] cc65: update to 2.19.

---
 srcpkgs/cc65/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 

From 20a66d1bdf525bee71cad5c20b7fb8f86a6f60af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:08:46 -0700
Subject: [PATCH 182/825] CLion: update to 2021.2.

---
 srcpkgs/CLion/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..f2ab575cea34 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -28,8 +28,19 @@ post_extract() {
 	# Remove files for other CPU architectures
 	rm -rf bin/fsnotifier-arm
 	rm -rf lib/pty4j-native/linux/aarch64
+	rm -rf lib/pty4j-native/linux/arm
 	rm -rf lib/pty4j-native/linux/mips64el
 	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
@@ -37,6 +48,7 @@ post_extract() {
 			rm -rf bin/clion.vmoptions
 			rm -rf bin/libyjpagent-linux.so
 			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/performanceTesting/bin/libyjpagent.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
 		i686)
@@ -44,6 +56,7 @@ post_extract() {
 			rm -rf bin/clion64.vmoptions
 			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac

From d8a2549a152025edfce521d6f568458bf2e59fad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:26:08 +0300
Subject: [PATCH 183/825] bmake: update to 20210704.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..17f5dc72ad89 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210704
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
 python_version=3
 
 do_configure() {

From b5d6157d8c38272c5b02af4cbce71f77edbcc34a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 09:35:29 +0300
Subject: [PATCH 184/825] help2man: update to 1.48.3.

---
 srcpkgs/help2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes

From 07fef5810a29deb931d78733432358866c11d501 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 15:48:40 +0200
Subject: [PATCH 185/825] apk-tools: update to 2.12.7.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {

From 1e02f8dfbc517088661a976aca9b70376df9463e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:25:52 +0200
Subject: [PATCH 186/825] erlang: update to 24.0.5.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a5d45ab414757f79ea0be705957c0b445d189add Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:26:13 +0200
Subject: [PATCH 187/825] linux5.13: update to 5.13.8.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..43a3f6aa16a6 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.8
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 4dc9936a2e1cca6b2e19d6cfb750c6a05cf95b66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 4 Aug 2021 17:28:18 +0200
Subject: [PATCH 188/825] linux5.10: update to 5.10.56.

Use classic timestamp in KBUILD_BUILD_TIMESTAMP.
---
 srcpkgs/linux5.10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 2832c9d04add..6242d17550e8 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.54
+version=5.10.56
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=bf50c63261847187eca4a1793e5df5c1355b21697409589f6ca03e32b629be44
+checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 

From 5230843f9f369e1c35f3f2617cbeadbe55c37f8e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voiceops.com>
Date: Wed, 4 Aug 2021 13:09:36 -0500
Subject: [PATCH 189/825] New package: sftpgo-2.1.0

---
 srcpkgs/sftpgo/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/sftpgo/template

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}

From d94728b669adf92dc8599479aa827850ac210405 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:56:10 +0200
Subject: [PATCH 190/825] icdiff: update to 2.0.4.

---
 srcpkgs/icdiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 3af6dfdcd074..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,6 +1,6 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.3
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=23e9502895999a929e1d3559403205846742f7cf8a22c5d7f3c4db910ba12321
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 5a818992ea80ead45c200f5be0d3eaea66d0d287 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 Aug 2021 20:57:32 +0200
Subject: [PATCH 191/825] prosody: update to 0.11.10.

Fixes CVE-2021-37601.
---
 srcpkgs/prosody/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"

From 52ed770d2b8e2290f6fb3c3534b6f662c9e3b581 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Tue, 3 Aug 2021 10:37:50 +0200
Subject: [PATCH 192/825] fail2ban: update to version 0.11.2

---
 srcpkgs/fail2ban/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3

From adc05833a68047f4608d678f41997bce7058f0b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 193/825] New package: python3-smartypants-2.0.1

---
 srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-smartypants/template

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}

From eb7520cc8138b52fdb76d726d62ad9b34d26a453 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 194/825] New package: python3-typogrify-2.0.7

---
 srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-typogrify/template

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}

From baecb2ac5562176dc002099a13e34a5f6c6373af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 195/825] New package: gi-docgen-2021.6

---
 srcpkgs/gi-docgen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gi-docgen/template

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails

From 775f1e9500d13aa060d8aa56828bf5d09a157a52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 7 Jul 2021 17:08:00 +0200
Subject: [PATCH 196/825] sysprof: update to 3.40.1.

---
 srcpkgs/sysprof/patches/build.patch |  10 --
 srcpkgs/sysprof/patches/musl.patch  | 157 ----------------------------
 srcpkgs/sysprof/template            |  12 +--
 3 files changed, 4 insertions(+), 175 deletions(-)
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch

diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }

From 1584f6641ac5a455f978b45a9ca7a26d00514b0a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Jun 2021 23:48:13 +0200
Subject: [PATCH 197/825] gtk4: update to 4.2.1, split docs, enable sysprof

---
 srcpkgs/gtk4-doc                       |  1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch | 23 ++++++++++++++++
 srcpkgs/gtk4/template                  | 36 +++++++++++++++++++-------
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch

diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 9b48a4f0c5e0ccbf17074cbab54691352179009c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 3 Aug 2021 20:56:22 +0200
Subject: [PATCH 198/825] electrum: update to 4.1.5.

---
 srcpkgs/electrum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From b14cef1cd92d5a3253b5e42bd43d46ba1e5c9c3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Jul 2021 11:01:29 +0200
Subject: [PATCH 199/825] libinput: update to 1.18.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"

From fdc57786c3644bdc6ab6ba5cb566fd0b49bd0951 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Thu, 5 Aug 2021 11:10:15 -0400
Subject: [PATCH 200/825] shotcut: remove qt5-webkit-devel dep

shotcut does not use webkit since
https://github.com/mltframework/shotcut/commit/a44fe75a4dc7410668935cd0d3470994f5997571.
no revbump because this is purely build-time change.
---
 srcpkgs/shotcut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"

From 57b2e19a9775e63efac22754aae3125e0db87bd0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 19:56:44 +0300
Subject: [PATCH 201/825] notcurses: update to 2.3.13.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 4b3563f65ffc..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=ce042908fac11f7df1f9eaa610e46e9c615f53ab036b7c27ae2396292512407b
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From 0460665ab43b95d2d95e960995315ad6742f4610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 5 Aug 2021 09:27:02 -0300
Subject: [PATCH 202/825] nvidia: fix proton errors.

Proton sometimes errors out with:

  The NVIDIA driver was unable to open
  'libnvidia-glvkspirv.so.470.57.02'. This library is required at run
  time.

This is caused by an out of date glibc cache, so we now run ldconfig in
INSTALL. This solution was pointed out by mvf.

Unfortunately, this isn't the entirely correct solution: ldconfig should
always be run after package installations that touch /usr/lib, to avoid
similar issues. Until there's a simple solution for it (maybe general
purpose XBPS hooks), this is the best we can do.

Fixes: #32222
---
 srcpkgs/nvidia/INSTALL  | 3 +++
 srcpkgs/nvidia/template | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia/INSTALL

diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..9c022ef65649 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=470.57.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"

From f6b8a366742d1dd5b1441a4b7c20de270d56765a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:01:56 +0300
Subject: [PATCH 203/825] font-awesome5: update to 5.15.4.

Also:
- add changelog.

Closes: #32339 [via git-merge-pr]
---
 srcpkgs/font-awesome5/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 

From cffe7b20ded28ae8e17c9a516a4806804da3d525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A9TwT?= <vcyzscape@gmail.com>
Date: Fri, 6 Aug 2021 00:55:17 +0700
Subject: [PATCH 204/825] zoom: update to 5.7.28991.0726_1

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 31e39b774927db23b617ebc30c1a6c33bdae4791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 12:49:42 +0200
Subject: [PATCH 205/825] ipset: update to 7.15.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 51150121385d..77c85ff074f7 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.14
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"

From 0f9a42818c53870137cfc6378cb25d9dffc47197 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:36:27 +0200
Subject: [PATCH 206/825] extrace: update to 0.8.

---
 srcpkgs/extrace/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE

From 8008a848bc7a8836c1385d51ec0968e9b2893f17 Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Mon, 12 Jul 2021 04:17:31 -0600
Subject: [PATCH 207/825] arcan: add arcan_sdl subpackage

arcan_sdl allows the running of arcan nested within a different
display server.
---
 srcpkgs/arcan/template | 13 +++++++++++--
 srcpkgs/arcan_sdl      |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/arcan_sdl

diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file

From 44489c0572dd28b893cbbd7b8f01344fffb42c9d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:28:11 +0300
Subject: [PATCH 208/825] papirus-icon-theme: update to 20210802.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons

From bedb3f4adaf05a24eb610988b81300221ca49c02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 Aug 2021 21:45:16 +0200
Subject: [PATCH 209/825] ipset: fix checksum.

---
 srcpkgs/ipset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 77c85ff074f7..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=27031c36d355907031cce41e65553e99bb013d762fcd55392f63d7e84760f900
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"

From cabb68f88c11f25e2fd64ef07094b48fcde2bdef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 5 Aug 2021 22:51:37 +0200
Subject: [PATCH 210/825] New package: abcmidi-2021.06.27

---
 srcpkgs/abcmidi/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/abcmidi/template

diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38

From 5894e93b0d0bfca141bc90ee284e4f8aae9b2840 Mon Sep 17 00:00:00 2001
From: Wes Roberts <takq@a.zinc.email>
Date: Thu, 5 Aug 2021 18:12:44 -0400
Subject: [PATCH 211/825] timeshift: fix compatibility with util-linux 2.37.1.

Timeshift will only start in "Live USB Mode".

Upstream issues:
https://github.com/teejee2008/timeshift/issues/425
https://github.com/teejee2008/timeshift/issues/753
https://github.com/teejee2008/timeshift/issues/755
---
 srcpkgs/timeshift/patches/d437358a.patch | 23 +++++++++++++++++++++++
 srcpkgs/timeshift/template               |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch

diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"

From 9bec1e96b1926f251236462d95e629676763a590 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 5 Aug 2021 23:28:12 +0200
Subject: [PATCH 212/825] hcloud: update to 1.26.1.

---
 srcpkgs/hcloud/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE

From 129ec18d7a5ac3f01744aa231d05858648a360f0 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 5 Aug 2021 21:29:38 +0300
Subject: [PATCH 213/825] zoxide: update to 0.7.3.

---
 srcpkgs/zoxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE

From d2b42cca2ea516b3c2b8e7cdc180eaf98801c787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 22:11:18 -0300
Subject: [PATCH 214/825] virtualbox-ose: update to 6.1.26.

Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.

Fix build by setting the correct Qt5 base include path.
---
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 +
 srcpkgs/virtualbox-ose/template              | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {

From 854401248781e1e81f6afcb1ab2370199069e7b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 14:51:17 +0200
Subject: [PATCH 215/825] nncp: update to 7.5.1.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 279d6235b763..48ae842e0016 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.0
+version=7.5.1
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=14d92dc5b8164ee44926d7af46da9f230c8f6207350cc7476db5cdfb8e7c3fe4
+checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
 
 do_build() {
 	make

From 9ee4b4d2900632f8337e3a0825c62c3d1bbe1025 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:02:39 +0200
Subject: [PATCH 216/825] python3-pipx: update to 0.16.4.

---
 srcpkgs/python3-pipx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE

From d95459c1d2c7a72889c8556c60aefab2ec2bb9ba Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 5 Aug 2021 22:58:59 +0300
Subject: [PATCH 217/825] jrnl: update to 2.8.2.

---
 srcpkgs/jrnl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no

From 0bcecfb7e9fbcb555cdccd06ef3267dc5f654ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:48 +0700
Subject: [PATCH 218/825] cmake: update to 3.21.1.

---
 srcpkgs/cmake/patches/ar-lwyu.patch           | 20 +++++++++
 .../patches/ignore-crape-compiler-test.patch  | 13 ++++++
 srcpkgs/cmake/patches/test-none.patch         | 41 -------------------
 srcpkgs/cmake/template                        | 11 ++---
 4 files changed, 36 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do

From 2f4afa8f1abfddd2c577a35847f1196ee2d52840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 24 Jul 2021 09:30:56 +0700
Subject: [PATCH 219/825] cmake-gui: update to 3.21.1.

---
 srcpkgs/cmake-gui/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.

From 3ebca62316bbab53b59e1d9d7fd2dbf4db6baee7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:27:38 +0200
Subject: [PATCH 220/825] bcc: link LLVM dynamically.

As a distro, we want this anyway, but static linking also broke, e.g.
bpftrace: https://github.com/iovisor/bpftrace/issues/1855
---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index c2b7a65c19fd..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.21.0
-revision=3
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"

From 374f72032c4a8a3c6cda89db5f5bcb31c603c015 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 15:28:42 +0200
Subject: [PATCH 221/825] bpftrace: rebuild against bcc-0.21.0_4.

---
 srcpkgs/bpftrace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..8ca8a7f2409f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run

From 19cdce0d2be1f7e61e38bea75aae7a1093ab60e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 Aug 2021 16:20:59 +0200
Subject: [PATCH 222/825] bpftrace: set nostrip.

---
 srcpkgs/bpftrace/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 8ca8a7f2409f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools

From 6876e80203dbaa9430a022ad3b5ba87cfe223243 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:52:35 -0400
Subject: [PATCH 223/825] cpp-utilities: update to 5.11.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 4cd28529efe0f1a6bfd1fed0663e81e0a1dd0fef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:53:14 -0400
Subject: [PATCH 224/825] tageditor: update to 3.4.2.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 2adc3fa61cb6f9d7c7bd8bf340c6e7a6b0abb665 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 11:54:25 -0400
Subject: [PATCH 225/825] python3-pyzmq: update to 22.2.1.

---
 srcpkgs/python3-pyzmq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF

From 84958059cef86cef3da7be9fff21ed2057c18bfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Aug 2021 12:42:19 -0400
Subject: [PATCH 226/825] python3-pip: update to 21.2.3.

---
 srcpkgs/python3-pip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 3e800139d4da..225ede1ccd09 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.2
+version=21.2.3
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=38e9250dfb0d7fa842492bede9259d4b3289a936ce454f7c58f059f28a94c01d
+checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
 # Tests have unpackaged dependencies
 make_check=no
 

From 502aca3c9b04f46be25bc819ca48f5e3eb30f26f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 22 Jul 2021 17:41:10 +0200
Subject: [PATCH 227/825] zsh-autosuggestions: update to 0.7.0.

---
 srcpkgs/zsh-autosuggestions/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }

From 92d6280a14f6c284675a56158d8ccacf7f522437 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:05:59 +0200
Subject: [PATCH 228/825] gotop: update to 4.1.2.

---
 srcpkgs/gotop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE

From c49272fd95e01b152dfe2688adcd5bb88aae65d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:01:55 +0200
Subject: [PATCH 229/825] vala: update to 0.52.4.

---
 common/shlibs                                 |  2 +-
 .../vala/patches/disable-unstable-tests.patch | 14 ++++++++++++++
 srcpkgs/vala/template                         | 19 ++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..7a0c44e9a713 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {

From 5a574082dbe375ec54e45aa8449529b23bc1af72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:08:12 +0200
Subject: [PATCH 230/825] valadoc: update to 0.52.4.

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/patches  | 1 +
 srcpkgs/valadoc/template | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/valadoc/patches

diff --git a/common/shlibs b/common/shlibs
index 7a0c44e9a713..7e6b6fb0d1d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3120,7 +3120,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if

From d6b24ecc0fb30fd95d6f1eda42e91f233f1b4022 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:05:29 +0200
Subject: [PATCH 231/825] vala-language-server: update to 0.48.3.

---
 srcpkgs/vala-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b

From 4717e3aec14874e82f674d88d446373fff7c83bb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:19:57 +0200
Subject: [PATCH 232/825] io.elementary.code: rebuild with vala-0.52.4

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"

From 9b0fdff4cded06134732af00683c9e98bf9eb0af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:20:11 +0200
Subject: [PATCH 233/825] valabind: update to 1.8.0.

---
 srcpkgs/valabind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd

From 13f86007f290ac649623c61bd7fcd79fc0f7d363 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 19:47:45 +0200
Subject: [PATCH 234/825] bomi: remove package.

Unmaintaned and broken, UI doesn't work.

Upstream issue:
https://github.com/ashinan/bomi/issues/540
---
 srcpkgs/bomi/patches/ffmpeg3.x.patch    |  32 ----
 srcpkgs/bomi/patches/ffmpeg4.patch      | 195 ------------------------
 srcpkgs/bomi/patches/fix-cxx14.patch    |  67 --------
 srcpkgs/bomi/patches/fix-sysctl_h.patch |  22 ---
 srcpkgs/bomi/template                   |  35 -----
 5 files changed, 351 deletions(-)
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template

diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}

From ab99118686705a9ab6544f276fa4a111b04e78a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 6 Aug 2021 16:25:50 -0300
Subject: [PATCH 235/825] removed-packages: add bomi and revbump.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..78ba7731cc3e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=47
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1

From bc22494d4291a69d0092a0bbb3b6f673f4ab3b0b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:18:21 +0200
Subject: [PATCH 236/825] dlayer: update to 0.3.1.

---
 srcpkgs/dlayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE

From 254efe85bb67582197d97c26c96ca7f25a2f6b90 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 6 Aug 2021 20:19:37 +0200
Subject: [PATCH 237/825] skopeo: update to 1.4.0.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 963354f1ae33f73e28b47f7c43dd39dffa0ec20c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 22:36:22 +0300
Subject: [PATCH 238/825] font-sarasa-gothic: update to 0.34.1.

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 

From ba75905a75bc9e5a7591c48716f7bda0fef9c4ef Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 6 Aug 2021 10:05:46 +0200
Subject: [PATCH 239/825] libid3tag: fix distfiles + lint error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

used mirror distfiles.exherbo.org doesn’t respond anymore
use original sourceforge download site
---
 srcpkgs/libid3tag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {

From 36ad4020678ac2f953103cc8afcaf1dac8eeea6a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 6 Aug 2021 21:36:05 +0200
Subject: [PATCH 240/825] vscode: update to 1.59.0

---
 srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++--
 srcpkgs/vscode/patches/gulp.patch                 | 4 ++--
 srcpkgs/vscode/patches/remove_git_command.patch   | 5 +++--
 srcpkgs/vscode/template                           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"

From 80708719fe8b7ddd2f42603993e5c8ba613b54b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 09:53:55 +0200
Subject: [PATCH 241/825] New package: snowball-2.1.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libstemmer                            |  1 +
 srcpkgs/libstemmer-devel                      |  1 +
 .../snowball/patches/libstemmer-library.patch | 33 ++++++++++
 srcpkgs/snowball/template                     | 60 +++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template

diff --git a/common/shlibs b/common/shlibs
index 7e6b6fb0d1d6..b8fda590d5f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}

From bc4c6cb0d5c0aa2a6b01e74265a0dfe5db512ecc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 26 Apr 2021 12:04:43 +0200
Subject: [PATCH 242/825] geary: update to 40.0.

---
 srcpkgs/geary/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..3891e7190112 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in

From 968904ad6a86d9b6be8ed1ccdb1045d2123bec18 Mon Sep 17 00:00:00 2001
From: reedts <j.reedts@gmail.com>
Date: Fri, 6 Aug 2021 13:23:34 +0200
Subject: [PATCH 243/825] ugdb: update to 0.1.10.

---
 srcpkgs/ugdb/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE

From ba980cfa21beda60a7fa605bb3f8756831e7a337 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Fri, 6 Aug 2021 21:27:50 +0300
Subject: [PATCH 244/825] protonvpn-cli: add missing dependency

---
 srcpkgs/protonvpn-cli/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index c9a3c784ace6..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,12 +1,13 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.11
-revision=1
+revision=2
 wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"

From ca8150ce4cc4b3ced76f14e6484e881c09c2f93d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:43:36 +0200
Subject: [PATCH 245/825] github-cli: update to 1.14.0.

---
 srcpkgs/github-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date

From 743521e5a23eb9c520f7a2c2952c92574ae2c3d8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 23:53:39 +0200
Subject: [PATCH 246/825] sigil: update to 1.7.0.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 5b5e97490323801ee94d64b79652df6c30294dd1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:24:59 +0200
Subject: [PATCH 247/825] go: update to 1.16.7.

---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 

From fbcba68bfe881cda65e458eb75ffef56b0f19140 Mon Sep 17 00:00:00 2001
From: notthewave <74874782+notthewave@users.noreply.github.com>
Date: Sat, 3 Jul 2021 00:25:52 +0200
Subject: [PATCH 248/825] New package: ART-1.9.3.

Since ART is a RawTherapee fork, the template is basically the same,
with the addition of exiv2 as a dependency.
---
 srcpkgs/ART/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/ART/template

diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e

From 28d4b10e5b32aeea8ee2b1bbfb461a2015e0b211 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:24:34 +0200
Subject: [PATCH 249/825] linux5.4: update to 5.4.138.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 807b6b49c848..c204d64759c3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.137
+version=5.4.138
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
+checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 9878fd2de973a59bffb1c255592270feeae544a1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 Aug 2021 10:26:19 +0200
Subject: [PATCH 250/825] linux4.19: update to 4.19.201.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 1962af9c6030..b79ed782a91c 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.200
+version=4.19.201
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=307409d9c6b46eeb64d327ddd5ffe7c7e9a50fc1b4719caed670674d83e6081b
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 102da5a85235e383eb0c495bfa94020d8bf75f76 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:58:04 +0200
Subject: [PATCH 251/825] portage: update to 3.0.21.

---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf

From 23a767713446cfa50990e10aa72b27120714c52e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:07:47 +0200
Subject: [PATCH 252/825] xdotool: update to 3.20210804.2.

---
 srcpkgs/xdotool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 

From 07f9273e5a5c37ddb88317ea79b611d51b0c0d59 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:08:32 +0200
Subject: [PATCH 253/825] perl-WWW-Mechanize: update to 2.04.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171

From e2b8cd3e1d774ea4297f4af6106ce39835fa9ea3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:29 +0200
Subject: [PATCH 254/825] dovecot: update to 2.3.16.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..27a781db5139 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
+version=2.3.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 70024136da59051446248930ca54551f5e353f42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:12:33 +0200
Subject: [PATCH 255/825] dovecot-plugin-pigeonhole: update to 0.5.16.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7e6a1f9ee8332df0bfe312d1badcfdfc95031b14 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 16:43:05 +0200
Subject: [PATCH 256/825] lnav: update to 0.10.0.

---
 srcpkgs/lnav/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..93df79547535 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=

From 09af66c6b63044f3d71fee9c9fc7a74c01f5850e Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:39:54 +0000
Subject: [PATCH 257/825] firefox: orphan

---
 srcpkgs/firefox-i18n/template | 2 +-
 srcpkgs/firefox/template      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index d1526dfa7ba1..755b02d248c0 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -4,7 +4,7 @@ version=90.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..08c8efadf2d9 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -7,7 +7,7 @@ version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"

From 9b34a80f664a130538039138140dbb8e536ade0f Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:29 +0000
Subject: [PATCH 258/825] ImageMagick: orphan

---
 srcpkgs/ImageMagick/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"

From dfe008e9d639642fe30b32151e1e264319f0e803 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:40:37 +0000
Subject: [PATCH 259/825] ImageMagick6: orphan

---
 srcpkgs/ImageMagick6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 7fbcb1d3150c..213d98a37659 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -16,7 +16,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
  libwmf-devel ocl-icd-devel pango-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"

From a3d08f2bd9d82b3952d17c7737d615d319afc0ce Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:20 +0000
Subject: [PATCH 260/825] cbindgen: orphan

---
 srcpkgs/cbindgen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"

From 5d67e15c2385006a3eaa7262f47f8a740a26aabd Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:35 +0000
Subject: [PATCH 261/825] cozy: orphan

---
 srcpkgs/cozy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b198300da9a4..b08360fffde3 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -11,7 +11,7 @@ depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"

From 95dfe3c79e96766c45590a8fa5162047379ed6be Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:41:54 +0000
Subject: [PATCH 262/825] ffmpeg: orphan

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..0a0d24683082 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -4,7 +4,7 @@ pkgname=ffmpeg
 version=4.3.2
 revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"

From 9a03a5c9a5e89eacb96e9d2fe47bba49a3f2b1ed Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:12 +0000
Subject: [PATCH 263/825] iverilog: orphan

---
 srcpkgs/iverilog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"

From 140ba315a83771a84c78514c6fa5d92b0d5736fe Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:29 +0000
Subject: [PATCH 264/825] kdenlive: orphan

---
 srcpkgs/kdenlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"

From 7c1e5477b36fd376d81262146fbd14a1fd14fdc4 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:42:50 +0000
Subject: [PATCH 265/825] mercurial: orphan

---
 srcpkgs/mercurial/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"

From 269f0db128a78a3f256a44ddef71dae4ab25e395 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:14 +0000
Subject: [PATCH 266/825] nv-codec-headers: orphan

---
 srcpkgs/nv-codec-headers/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"

From 5abc8ca58f11c09775a3cb1d78c3c842133c23eb Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:33 +0000
Subject: [PATCH 267/825] olive: orphan

---
 srcpkgs/olive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"

From 4a740196ba8e5fc89c47843d44eaefde9ade94e2 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:43:43 +0000
Subject: [PATCH 268/825] papi: orphan

---
 srcpkgs/papi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"

From a611ef27b5a4b6ae490b305f68eb8e16352eedf8 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sat, 7 Aug 2021 12:44:02 +0000
Subject: [PATCH 269/825] postgresql: orphan

---
 srcpkgs/postgresql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..6c30501a7c61 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -13,7 +13,7 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"

From 14a7606b7a5c30b608f82a1c89b760765295201e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 18:01:30 +0200
Subject: [PATCH 270/825] lnav: fix cross.

---
 srcpkgs/lnav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 93df79547535..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh"
+hostmakedepends="automake openssh zlib-devel"
 makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
  pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"

From fdaa57f8a159c19725b5b7378abfd9a7a6a05fb2 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 7 Aug 2021 09:54:19 +0200
Subject: [PATCH 271/825] imv: update to 4.3.0.

---
 srcpkgs/imv/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..608cc8790641 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {

From c80b668161e2484d9369136d262ebd800abfe485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 7 Aug 2021 11:04:45 +0200
Subject: [PATCH 272/825] mpd: update to 0.22.10.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From 27a32ccbceb78639d59262751ca9445621a2c707 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Fri, 6 Aug 2021 16:45:33 +0200
Subject: [PATCH 273/825] herbstluftwm: update to 0.9.3

small cosmetic issues
---
 srcpkgs/herbstluftwm/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE

From 7c66d8efcd675cecba9b3712a739f5d7e006eede Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Tue, 3 Aug 2021 19:25:58 -0700
Subject: [PATCH 274/825] hydroxide: update to 0.2.20.

---
 srcpkgs/hydroxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE

From 605d061d5abdf8f71342025f16dab899357946c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 19 Jul 2021 16:48:03 +0200
Subject: [PATCH 275/825] New package: tootle-1.0

---
 srcpkgs/tootle/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/tootle/template

diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496

From 58fb5c7cdd01e43c8443c04e3010c8493b3e206e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 Aug 2021 21:27:15 +0200
Subject: [PATCH 276/825] graphviz: depend on a default font.

With no fonts available (e.g. chroots), graphviz crashes in pango:
https://gitlab.gnome.org/GNOME/pango/-/issues/588

Depend on liberation fonts which provides the default
times font and most people have it anyway.
---
 srcpkgs/graphviz/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"

From 282e14fcf6ccabd1f45066410afa8c3d9cb0d32f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 7 Aug 2021 21:49:21 +0200
Subject: [PATCH 277/825] lowdown: update to 0.8.6.

---
 srcpkgs/lowdown/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md

From 80a6ab44f7ec23b84ead8d95eaa47b97f12c1de3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 7 Aug 2021 15:47:17 +0200
Subject: [PATCH 278/825] freerdp: update to 2.4.0

---
 srcpkgs/freerdp/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;

From 608641723e6d9220f67da6fe454152f4d761ed04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 Aug 2021 00:27:31 +0200
Subject: [PATCH 279/825] lynx: update to 2.9.0dev.9.

---
 srcpkgs/lynx/template | 11 +++++------
 srcpkgs/lynx/update   |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/lynx/update

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"

From 34bca945bff8857d1f322ad7d43fb268c264ad42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 Aug 2021 00:19:58 +0300
Subject: [PATCH 280/825] cherrytree: update to 0.99.39.

---
 srcpkgs/cherrytree/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..8789cd37dba7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
+version=0.99.39
 revision=1
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"

From 26e54c12322dd1c90732727fec6e93c1f2f6b441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 Aug 2021 09:45:27 +0700
Subject: [PATCH 281/825] deluge: allow deluged to be run as different user

Close: #31690
---
 srcpkgs/deluge/files/deluged/run       |  2 +-
 srcpkgs/deluge/patches/drop-priv.patch | 40 ++++++++++++++++++++++++++
 srcpkgs/deluge/template                |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"

From 06ab55e8270708fcc82e4a52ece5e5577e9b24f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 Aug 2021 11:23:37 +0700
Subject: [PATCH 282/825] vcompletion: return failure on wrong arguments

---
 common/environment/setup/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }

From 492271c9fc454062eb08a9ffe2f350daec3e5a7e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:46:47 +0300
Subject: [PATCH 283/825] cozy: update to 1.1.0.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b08360fffde3..652ed886f3a9 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.4
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=d32b76e0a1506ab72d0b45bb0f5711c490a3105fce1019f173536f19716a07f2
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38

From 892f523e7e757f0dfd6c5fb803aaa91efb851596 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 284/825] New package: libadwaita-1.0.0alpha2

---
 common/shlibs                                 |  1 +
 srcpkgs/libadwaita-demo                       |  1 +
 srcpkgs/libadwaita-devel                      |  1 +
 .../patches/disable-broken-tests.patch        | 10 ++++
 srcpkgs/libadwaita/template                   | 59 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template

diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5affb5dc09fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,6 +3511,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..cb23b656c004
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-$_ver"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}

From ab0d770562498a79130285857cdf67778f03d46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 8 Aug 2021 19:08:49 +0200
Subject: [PATCH 285/825] croc: update to 9.2.1.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE

From ddc8f62e4399ab67bd4732f6acf5e46dfb8b501d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 22:09:09 +0300
Subject: [PATCH 286/825] putty: update to 0.76.

Also:
- add changelog.
---
 srcpkgs/putty/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 

From 9b2c36a8b91becf6543c38a797e606349dd77090 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:03:59 +0300
Subject: [PATCH 287/825] gpodder: update to 3.10.21.

Also:
- add necessary packages to depends and checkdepends.
---
 srcpkgs/gpodder/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest

From 2499cf0b5a483525eff55cf577b4b3e02a36eb22 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 23:05:09 +0300
Subject: [PATCH 288/825] New package: python3-pytest-httpserver-1.0.1

---
 srcpkgs/python3-pytest-httpserver/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-httpserver/template

diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..d866ff71c6df
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc="pytest-httpserver-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}

From c1248239e3d1d845a0fd8ecda77668aa090a50b9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:27:52 +0300
Subject: [PATCH 289/825] bmake: update to 20210803.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 17f5dc72ad89..ef3463e7e554 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210704
+version=20210803
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=3efe8e1b11c52c9a396787df1d383a20de725115055dab4fdba04f8557315c36
+checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
 python_version=3
 
 do_configure() {

From 70b94605bbe99daafa44a0fcaf0245b583b1b697 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 21:58:01 +0300
Subject: [PATCH 290/825] stremio-shell: update to 4.4.142.

---
 srcpkgs/stremio-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {

From 8c27555a6c6731f13e8aa057873b867bf2deddc6 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 7 Aug 2021 15:39:08 +0200
Subject: [PATCH 291/825] master-pdf-editor: update to 5.7.90.

---
 srcpkgs/master-pdf-editor/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5

From 453386dbdac634d5dc140c95efd00baa7cdd03e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:03:39 +0300
Subject: [PATCH 292/825] catfish: update to 4.16.2.

---
 srcpkgs/catfish/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b

From 9bf235b9d5e81647fe54bd0b6465f4357fded2cc Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:15:35 +0200
Subject: [PATCH 293/825] py3status: update to 3.38.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE

From b2399646a26826dc4a01c2cbc1af526426561c74 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 7 Aug 2021 11:05:38 +0300
Subject: [PATCH 294/825] sdparm: update to 1.12.

---
 srcpkgs/sdparm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING

From 62f3090fb014cd7828bd49f943c55042c8a7964c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 Aug 2021 13:09:34 +0300
Subject: [PATCH 295/825] xfce4-sensors-plugin: update to 1.4.1.

Closes: #32391 [via git-merge-pr]
---
 srcpkgs/xfce4-sensors-plugin/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 2af12665cb84dbc8b851fd98327cda7898c5921c Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 7 Aug 2021 18:33:22 +0530
Subject: [PATCH 296/825] Komikku: update to 0.30.0.

---
 srcpkgs/Komikku/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..7a612602214d 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
-revision=2
+version=0.30.0
+revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6

From 5f37e142e6f6e59c409f2de0cdf7f0e26a231cff Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:19:29 +0200
Subject: [PATCH 297/825] drone-cli: update to 1.3.0.

---
 srcpkgs/drone-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c

From 61595973d6eb4ef354a25136538bc8003ec511c6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:43:00 +0200
Subject: [PATCH 298/825] gparted: update to 1.3.1.

---
 srcpkgs/gparted/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:

From 771a0f0205e4ff32b82f6d0d15f8e3f7d3067075 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 09:54:53 +0200
Subject: [PATCH 299/825] openimagedenoise: update to 1.4.1.

---
 srcpkgs/openimagedenoise/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest

From 543c6de08df9b994b6ba0e0f1b32883ced2211b7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 21:01:21 +0300
Subject: [PATCH 300/825] kvantum: update to 0.20.1.

---
 srcpkgs/kvantum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From 4e638ee39bc558222c70a9e0e622fae1c9022f95 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Fri, 6 Aug 2021 13:38:14 +0300
Subject: [PATCH 301/825] mesa: add zink gallium driver

---
 srcpkgs/mesa/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8664f4d799bc..68d6a112681e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.1.6
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
@@ -152,9 +152,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +163,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 

From 6ad1cc7cc4573ee3fa4e7fc4daff66bffebfc2e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:42:54 +0300
Subject: [PATCH 302/825] qt5ct: update to 1.3.

---
 srcpkgs/qt5ct/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..b0a5d19b3cba 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
+version=1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING

From e19b450ed6284f28385fa302dc1aff450d2fab12 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 6 Aug 2021 22:03:59 +0200
Subject: [PATCH 303/825] instaloader: update to 4.8.

---
 srcpkgs/instaloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE

From 11dea899f9ae6088ddbe3ee4173b9a79d8abb55f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 7 Aug 2021 10:29:30 +0200
Subject: [PATCH 304/825] volctl: update to 0.9.0.

---
 srcpkgs/volctl/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code

From fe42ca1f93033d82f64c9b43dd8e75fa3a336ed2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 3 Aug 2021 19:20:34 +0400
Subject: [PATCH 305/825] libcap: update to 2.52.

---
 srcpkgs/libcap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 37b496d7ec804d98c5540f454dff835a774ce72a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:00:00 +1000
Subject: [PATCH 306/825] retroarch: disable gles2 by default, add libusb and
 xdg-utils deps

When both gles2 and opengl options are enabled, RetroArch will only
build with OpenGL ES support. This prevents OpenGL only cores from working.
Disable gles2 by default and use the glcore driver which provides OpenGL 3.2+
and OpenGL ES 3+ support. Fixes: #32246

libusb support is automatic and is currently pulled in when sdl2 is enabled.
Add it to makedepends to ensure it's always enabled.

RetroArch will call xdg-screensaver when it's built with X11 support.
Add xdg-utils to depends when the x11 option is enabled.
---
 srcpkgs/retroarch/template | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 

From c18de35a9a8d939c692e4242ba91791bf39f103f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:52 +0200
Subject: [PATCH 307/825] babashka: update to 0.5.1.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 

From b9961506beece288ca6f5675cd6f4c0b0e283618 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:03:56 +0200
Subject: [PATCH 308/825] byacc: update to 20210808.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index db54998f0f25..e987a97cce79 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210802
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=2949c67ed13bd67917f0c9bcc85c76d99a3090d21105ea7672a87a3502e3ccf6
+checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 0d51e41b7f1c55ce97fe152380126e2751038187 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:05:37 +0200
Subject: [PATCH 309/825] nncp: update to 7.6.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 48ae842e0016..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.5.1
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=b093a745c2eb9f5fe8341ed2a6f1ee75701b2646b5701baaf4e760d932cdd91a
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make

From 2416b39be22b4b5b5a90e841a2e96492f90faecc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 Aug 2021 11:06:38 +0200
Subject: [PATCH 310/825] ugrep: update to 3.3.7.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 2de843eb240abeaeaed8d4b9dee1bd269ad56cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Aug 2021 20:15:39 +0200
Subject: [PATCH 311/825] amdvlk: update to 2021.Q3.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..e91154da11d4 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.2
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
+_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
+_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
+_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
+ 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
+ 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
+ fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
+ d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From fbf78154deee50d0829738cd82d8a3ad9997a0be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 14:32:17 +0200
Subject: [PATCH 312/825] R-cran-ggplot2: update to 3.3.5.

---
 srcpkgs/R-cran-ggplot2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea

From 24d2d723c0077d762e4652eec5aa4f836452a597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:39:20 +0200
Subject: [PATCH 313/825] fixup! amdvlk: update to 2021.Q3.2.

---
 .../amdvlk/patches/cmake-build-type-none.patch   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt

From b65b51dd60a15f51cd171a9f8f66cdce1a514bfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:43:42 +0200
Subject: [PATCH 314/825] SLADE: update to 3.1.13.

---
 srcpkgs/SLADE/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in

From f7225805af0557bf84fea6dd435b38b2be4e2cfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:06 +0200
Subject: [PATCH 315/825] amdvlk: update to 2021.Q3.3.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index e91154da11d4..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.2
+version=2021.Q3.3
 revision=1
-_llpc_commit=64a67716cf85de1a6bf7e1891acb10794d9bb56e
-_xgl_commit=9210b6802b964cd875628aa67a52fa44a4ec5017
-_pal_commit=3e6d3ab088f3b7b405250e75de112df37c49398a
-_llvm_project_commit=3558c46649a7ef673ff95c58266e59b09626abf0
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="51937640f931800723233341f86c9264d59c5787c3b0a9e783014cd6c5c45c47
- 64f75bf5f16e7e5fa7173b8b178fe1703ec6c61cca6bab18d504de0e5cf95bc7
- 62606f0d6442a8c2af0413254429fdc82897108968139005898f45c91d9e4683
- fd9bb7bad274ecc746b672abb1edc954158c4333f7b2c4b888e996f966112e5c
- d1f72bf91e15f345cb99185fb00d0da0c645ef7da0cebd4671f93b7181f9faae
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 1b2a2ae6ba3b318d76022694bbe700817e6249cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:44:39 +0200
Subject: [PATCH 316/825] krita: update to 4.4.7.

---
 common/shlibs                                | 25 --------------------
 srcpkgs/krita/patches/aarch64.patch          | 19 +++++++++++++++
 srcpkgs/krita/patches/cross.patch            | 13 ++++++++++
 srcpkgs/krita/patches/invalid-MimeType.patch | 11 ---------
 srcpkgs/krita/template                       |  4 ++--
 5 files changed, 34 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch

diff --git a/common/shlibs b/common/shlibs
index 5affb5dc09fd..278d2456072f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 

From fa9fe89b2de7a3ba9fb65067eb1759e35fc63dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Aug 2021 22:45:22 +0200
Subject: [PATCH 317/825] pioneer: update to 20210723.

---
 srcpkgs/pioneer/patches/ppc.patch | 6 +++---
 srcpkgs/pioneer/template          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From a55648e8ddba7fc84bf5c5ca4581a8cd7023251d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 9 Aug 2021 13:03:25 +0200
Subject: [PATCH 318/825] homebank: update to 5.5.3.

---
 srcpkgs/homebank/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From f4cf9013dbfc8aa421c80d8fd158dfa42b0df689 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 5 Aug 2021 20:18:07 +0300
Subject: [PATCH 319/825] wps-office: update to 11.1.0.10702 and adopt.

---
 srcpkgs/wps-office/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 

From 51890b8c8274c24a3ea20979195c565c502214b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 9 Aug 2021 18:51:56 +0200
Subject: [PATCH 320/825] fetchmail: update to 6.4.21.

---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 964aadf452d13b74a0def4f81d715f8624ff64ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:44:32 +0200
Subject: [PATCH 321/825] psiconv: remove package

* upstream is dead, distfiles are not available
* depends on libmagick6
---
 srcpkgs/psiconv-devel             |  1 -
 srcpkgs/psiconv/template          | 28 ----------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template

diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 78ba7731cc3e..566536002191 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -229,6 +229,7 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From 70e69e36db44ccb51a052ea982e645f932200694 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jul 2021 10:48:46 +0200
Subject: [PATCH 322/825] meson: update to 0.58.2

---
 .../dont-use-native-pkgconfig-for-gir.patch   | 11 ---
 srcpkgs/meson/patches/fix-unittest.patch      | 77 -------------------
 srcpkgs/meson/template                        |  7 +-
 3 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch

diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 64d4eac7d8844f0979b22d67def3439002a86a91 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Mon, 9 Aug 2021 04:03:16 +0300
Subject: [PATCH 323/825] vale: update to 2.10.4.

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE

From 29c2a55ab3ef30e1227ee5cc28d436e31c3f31b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 14:14:18 +0200
Subject: [PATCH 324/825] goxel: update to 0.10.8.

---
 srcpkgs/goxel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From e678e13b22a8e4f87cfda28813f59dcf35f26492 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 15:02:41 +0200
Subject: [PATCH 325/825] clazy: update to 1.10.

---
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ++++++++++++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 -----
 srcpkgs/clazy/template                        |  11 +-
 3 files changed, 370 insertions(+), 93 deletions(-)
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch

diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d

From 059324779c25ea6f62977e05afc78a9d18f3dead Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 20:13:14 +0200
Subject: [PATCH 326/825] lagrange: update to 1.6.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..15992e57dbaa 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
 
 post_install() {
 	vlicense LICENSE.md

From 85eb810b4e4220961578d50a164982bc8efd85e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:06 +0200
Subject: [PATCH 327/825] knewstuff: add missing dependencies

closes #703
---
 srcpkgs/knewstuff/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..156fa1a0102b 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,11 +1,12 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
 version=5.84.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"

From a5659dc1dae87705a33c07b4a818e470fecf9f55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 9 Aug 2021 23:24:47 +0200
Subject: [PATCH 328/825] yakuake: add missing dependency

---
 srcpkgs/yakuake/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..61d6e2e645c4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,11 @@
 # Template file for 'yakuake'
 pkgname=yakuake
 version=21.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"

From cf9cf9fde9d266dfe6b57e56cf703e2b86fa7b37 Mon Sep 17 00:00:00 2001
From: ndgnuh <ndgnuh@protonmail.com>
Date: Sun, 8 Aug 2021 00:27:14 +0700
Subject: [PATCH 329/825] ibus-bamboo: update to 0.7.8.

---
 srcpkgs/ibus-bamboo/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }

From ece36fae0a89a95ee29aacf0b268326fb5eeb86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 10 Aug 2021 15:09:36 +0700
Subject: [PATCH 330/825] cozy: fix cross build with meson 0.57+

While we're at it, drop unnecessary makedepends, this is a python only
package after all.
---
 srcpkgs/cozy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 652ed886f3a9..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -4,9 +4,9 @@ version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"

From 198cf452e93c9ac32678f5b8c1e4e12ed9f0a30b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 10 Aug 2021 12:48:00 +0200
Subject: [PATCH 331/825] linux5.13: update to 5.13.9.

Set CONFIG_PTP_1588_CLOCK_KVM=m to remove a boot warning on non-VM boots.

Set CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y.
Set CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m, CONFIG_SND_SOC_RT1308=m.

Closes #30508.
---
 srcpkgs/linux5.13/files/i386-dotconfig   | 24 ++++++++++----------
 srcpkgs/linux5.13/files/x86_64-dotconfig | 28 +++++++++++++-----------
 srcpkgs/linux5.13/template               |  4 ++--
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 43a3f6aa16a6..2c8c80b9945f 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.8
+version=5.13.9
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- dfbaaf312cd69021fbe8ab597460aa961b8d2944efca35caa26b36fce43e616d"
+ 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b192a5e1e80fb7a35646363d2167369a604f472f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 08:27:36 -0300
Subject: [PATCH 332/825] c-ares: update to 1.17.2.

Fixes CVE-2021-3672.

Also fix tests (locally).
---
 srcpkgs/c-ares/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}

From 9d636d3bdacef27bf4bc3352daddaa5921565b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 10:09:34 +0200
Subject: [PATCH 333/825] crispy-doom: update to 5.10.2.

---
 srcpkgs/crispy-doom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 

From 3ca5820a1f9503692d6da3b0ab4eb70f7f68e7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 10 Aug 2021 09:53:42 +0200
Subject: [PATCH 334/825] doctl: update to 1.63.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0

From fb3eaae48b27fe37f0fe81748e9950f2a5c4133b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 10:34:01 +0300
Subject: [PATCH 335/825] thefuck: update to 3.31.

---
 srcpkgs/thefuck/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {

From 44b44c1260ddb2a8fd42bb65e51b64ab5b8cc8c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 16:46:29 +0200
Subject: [PATCH 336/825] piper: update to 0.6.

---
 srcpkgs/piper/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi

From c2adb8240dcf3a7d38c265547b8de8d1f933dca2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:32:15 +0200
Subject: [PATCH 337/825] sfeed: update to 1.0.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 9f3d23098319..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.25
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=a3d4a95bd660b6df4b7adaaecc7438fdb8ddd390b5d7e13fd14c2aeae1e2220a
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE

From 19a3a55a4ee766e354d78fe270370763a5f02db3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 9 Aug 2021 17:33:47 +0200
Subject: [PATCH 338/825] sfeed_curses: update to 1.0.

---
 srcpkgs/sfeed_curses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index 148f3d67f824..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.13
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=49f467dd6c511b2e4dbbb198beada51cccee0026ba4dc8b88bd46f833ea74130
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE

From 80ad1eb9a9b0f136037f57fab3abaf252ae8826e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 Aug 2021 18:10:39 +0300
Subject: [PATCH 339/825] broot: update to 1.6.3.

---
 srcpkgs/broot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 542bc12852bc2e685596366aa28d529136b45cbe Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 13:46:14 +0200
Subject: [PATCH 340/825] micro: update to 2.0.10.

---
 srcpkgs/micro/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE

From 9a4e0b2c077041b6865a46f926000563375d8653 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 8 Aug 2021 14:06:21 +0200
Subject: [PATCH 341/825] swaybg: update to 1.1.

---
 srcpkgs/swaybg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE

From 363e3df9d25e428cfeed233d22cc25ff63fe09d7 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sun, 8 Aug 2021 23:52:29 -0500
Subject: [PATCH 342/825] haproxy: enable hitless reloads

Switch HAProxy to a master/worker (-W) model, allowing for correct
handling of HUP signals. To do listening FD handoff, a stats socket with
'expose-fd listeners' needs to be part of the configuration file.
---
 srcpkgs/haproxy/files/haproxy.cfg | 1 +
 srcpkgs/haproxy/files/haproxy/run | 2 +-
 srcpkgs/haproxy/template          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..c155186f100d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.4.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"

From 1448a24c03f63520f91aa82dfed4b44feeb8e9d0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 17 Jun 2021 11:06:52 +0200
Subject: [PATCH 343/825] noise-repellent: update to 0.1.5.

Add patch made by ericonr to fix cross compilation.
---
 .../noise-repellent/patches/fix-cross.patch   | 28 +++++++++++++++++++
 srcpkgs/noise-repellent/template              |  6 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch

diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae

From a63e1b5601bdaf49d1094ca06a916cb5590d8cf3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:40:12 +0200
Subject: [PATCH 344/825] New package: libgnt-2.14.2.

---
 srcpkgs/libgnt                        |   1 -
 srcpkgs/libgnt-devel                  |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff | 130 ++++++++++++++++++++++++++
 srcpkgs/libgnt/template               |  31 ++++++
 4 files changed, 162 insertions(+), 2 deletions(-)
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template

diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}

From a46ad8173733f1fc982b65ae69149047aa7f3336 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 1 Aug 2021 10:42:14 +0200
Subject: [PATCH 345/825] pidgin: update to 2.14.6.

---
 .../patches/01-configure_ac-libnm_pc.patch    | 11 -------
 .../patches/02-libpurple-nm_state.patch       | 19 ------------
 srcpkgs/pidgin/template                       | 30 +++++--------------
 3 files changed, 7 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch

diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {

From cdd0a7812b02fe9f8f15d65a9ab6bb36d333957e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 10 Aug 2021 19:00:57 +0200
Subject: [PATCH 346/825] ugdb: fix build on platforms without 64-bit atomics

---
 srcpkgs/ugdb/patches/atomicu64.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch

diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 

From 62b997a8fac0610c66bf507a148b4f0efc920967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 14:10:41 -0300
Subject: [PATCH 347/825] srcpkgs/: touch new packages for the builders.

aarch64* repos are missing some.
---
 srcpkgs/libadwaita/template                | 2 +-
 srcpkgs/python3-pytest-httpserver/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index cb23b656c004..6b49f233b3ec 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -3,7 +3,7 @@ pkgname=libadwaita
 version=1.0.0alpha2
 revision=1
 _ver=1.0.0-alpha.2
-wrksrc="$pkgname-$_ver"
+wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d866ff71c6df..12afe88ffe07 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-httpserver
 version=1.0.1
 revision=1
-wrksrc="pytest-httpserver-${version}"
+wrksrc=pytest-httpserver-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pytest python3-Werkzeug"

From 85e2bc28355f72f6da09422c0ea6fdd58175018e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 10 Aug 2021 17:59:01 +0200
Subject: [PATCH 348/825] cmus: orphan

---
 srcpkgs/cmus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"

From 9f1d20273ce9280b4c140a59edfc1eb6d6c64658 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Tue, 10 Aug 2021 10:21:49 -0400
Subject: [PATCH 349/825] synapse: update to 1.40.0

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index b45f32817bdf..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.39.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=36b5949f3a989a52efb8ba7d9ca0f71cd13eea1a1cd0048756e2309c143dec53
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 30110eddaae5244ce00de41955b250d8bc7fc3b2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 4 Aug 2021 20:01:53 +0300
Subject: [PATCH 350/825] fstrm: update to 0.6.1.

---
 srcpkgs/fstrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi

From 9748f7ffb8d320d2280cbaae3fc72851c5d3b8f6 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 1 Aug 2021 17:04:00 +1000
Subject: [PATCH 351/825] xdg-utils: xdg-screensaver needs xset

---
 srcpkgs/xdg-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 

From 945c22b1cdb9b9089d354718985be824a213d7b3 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sat, 31 Jul 2021 09:26:45 -0400
Subject: [PATCH 352/825] dolphin-emu: update to 5.0.14790.

---
 .../dolphin-emu/patches/VkDeviceMemory.patch  | 37 -------------------
 srcpkgs/dolphin-emu/template                  | 20 +++++++---
 2 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch

diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }

From 6de2a07f31c5369e0e4100e6c1f5a76301278796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Tue, 10 Aug 2021 00:19:56 +0200
Subject: [PATCH 353/825] New package: alsa_rnnoise-1.0_1

Closes #29409
---
 srcpkgs/alsa_rnnoise/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/alsa_rnnoise/template

diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d

From 6f7803b354462ce3cbb5e415bd09b90b46295160 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Tue, 10 Aug 2021 19:23:15 +0100
Subject: [PATCH 354/825] font-iosevka: update to 9.0.1.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..1388c2af3ccd 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=9.0.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
+be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
 
 font_dirs="/usr/share/fonts/TTF"
 

From ccc4697d30902ecaf5bf56f12066e5d0cd05fd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 31 Jul 2021 15:22:09 +0200
Subject: [PATCH 355/825] podman: update to 3.2.3.

By ericonr:
- remove INSTALL.msg, it's been 4 months since the change
- add changelog
---
 srcpkgs/podman/INSTALL.msg | 15 ---------------
 srcpkgs/podman/template    |  5 +++--
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/podman/INSTALL.msg

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 73c0bab64683373e3d3f438d4ce8e940740a9cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:51:28 -0300
Subject: [PATCH 356/825] rustup: remove INSTALL.msg.

Anyone who finds the file under /usr/share/doc will be using
`xbps-query -f` to list package contents, so they might just as well see
the only executable in the package.
---
 srcpkgs/rustup/INSTALL.msg | 1 -
 srcpkgs/rustup/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/rustup/INSTALL.msg

diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo

From 0b53153930f2477b35b46cfe897985820215bdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:54:06 -0300
Subject: [PATCH 357/825] qt5ct: remove INSTALL.msg.

---
 srcpkgs/qt5ct/INSTALL.msg | 1 -
 srcpkgs/qt5ct/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg

diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index b0a5d19b3cba..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
 version=1.3
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"

From 45d9a736def438e1c3a4df6cd910bc23155807b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 15:55:12 -0300
Subject: [PATCH 358/825] git-lfs: remove INSTALL.msg.

Man page shows installation in EXAMPLES.
---
 srcpkgs/git-lfs/INSTALL.msg | 1 -
 srcpkgs/git-lfs/template    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg

diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"

From a47050cf5236b5afa259f01d849aba0ffe666cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:52:24 -0300
Subject: [PATCH 359/825] python3-docutils: update to 0.17.1, remove
 python-docutils.

---
 .../python-docutils/patches/test-import.patch | 20 ------
 srcpkgs/python-docutils/template              | 62 -------------------
 srcpkgs/python3-docutils                      |  1 -
 srcpkgs/python3-docutils/template             | 39 ++++++++++++
 4 files changed, 39 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template

diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}

From 9b375e93d2825cb51f815b1529d259d1a3851909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 16 Jun 2021 23:53:05 -0300
Subject: [PATCH 360/825] removed-packages: add python-docutils.

We ship only python3-docutils now.
---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 566536002191..fa919b6de59b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=47
+revision=48
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -234,6 +234,7 @@ replaces="
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2

From be6fb51739582fb4c7c9ae26dca67b0f1cb192da Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 Aug 2021 16:21:28 -0500
Subject: [PATCH 361/825] nvidia: update to 470.63.01.

---
 srcpkgs/nvidia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 9c022ef65649..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
-revision=2
+version=470.63.01
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}

From d4e3808492af189cfd3cdc8feb391d82e3404151 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 Aug 2021 21:44:56 +0200
Subject: [PATCH 362/825] catgirl: update to 1.9.

---
 srcpkgs/catgirl/patches/add-missing-include.patch | 10 ++++++++++
 srcpkgs/catgirl/template                          |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch

diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0

From 3ab746854933a2671846174e84766551221c13d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Jul 2021 01:38:42 -0300
Subject: [PATCH 363/825] rpi-kernel: update to 5.10.52.

- document how we pick the commit to be used
- fix header installations so dkms works; based on fixes to mainline
  kernel packages

In this update, we are using the commit from
https://github.com/raspberrypi/linux/releases/tag/1.20210727
---
 srcpkgs/rpi-kernel/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 22d1ed37eec412d993c0b277d03883beb9925d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:39 -0300
Subject: [PATCH 364/825] rpi2-kernel: update to 5.10.52.

---
 srcpkgs/rpi2-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 3ffa6f39e98524d239d3a72cdf8253564841873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 11:42:20 -0300
Subject: [PATCH 365/825] rpi3-kernel: update to 5.10.52.

---
 srcpkgs/rpi3-kernel/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From 4e4438ced96be85040889ea196bb595b92e6ab89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 4 Aug 2021 10:18:40 -0400
Subject: [PATCH 366/825] rpi4-kernel: update to 5.10.52.

---
 srcpkgs/rpi4-kernel/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 

From af72e1411e0531881f1fbd264046aebecfe01a52 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 21:39:19 -0500
Subject: [PATCH 367/825] nomad: update to 1.1.3

---
 srcpkgs/nomad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;

From 3b360a4e225ddc73e4ebe9b7682c552500bb73f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:50 -0300
Subject: [PATCH 368/825] mdBook: update to 0.4.12.

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 49e3264c70be..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.11
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=a66b57a2a70fbc8c665898bf952a7f8276e6f400c2d9340dbfd70ddb96b3562e
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE

From e7f4dfff3fb0118ec541ebecbc382bbc31e896da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:44:53 -0300
Subject: [PATCH 369/825] qbittorrent: update to 4.3.7.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}

From 070e756a6c39bc6684a78f8bb4a6f4e898918950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:58:40 -0300
Subject: [PATCH 370/825] gzdoom: update to 4.6.1.

---
 srcpkgs/gzdoom/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes

From 9d489ec884d0968aadfc31cb59ac6c2cd7eb102d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH 371/825] octave: update to 6.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
  packages easier was considered, but ultimately dismissed; since they
  aren't enough to actually build packages, they would increase
  dependency count for little gain

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
---
 srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From 644a89d95b2775b849d841fd28589a088ed66f2d Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:05:48 -0500
Subject: [PATCH 372/825] consul: update to 1.10.1.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE

From 21c7385bb2a3d3bf67778a6ea24b13f1805ae881 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Tue, 10 Aug 2021 23:13:16 -0500
Subject: [PATCH 373/825] vault: update to 1.8.1.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"

From 92fe487114f817f1ea886f8969bf0d7418794c93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 14:30:04 +0200
Subject: [PATCH 374/825] iputils: update to 20210722.

---
 srcpkgs/iputils/template | 6 +++---
 srcpkgs/iputils/update   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 srcpkgs/iputils/update

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'

From 401bbbd49e3512d3e4d53b6c65dca20809eba463 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:13:05 +0200
Subject: [PATCH 375/825] byacc: fix checksum

---
 srcpkgs/byacc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index e987a97cce79..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f3b0edd584a426da0ee1676e4ed7484e62f777c31ea33acf4c89d65e32c75cea
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From c58ed63a78d096074a14f9dd269d3e7b3065c0ed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:10:40 +0200
Subject: [PATCH 376/825] icu: update to 69.1.

---
 common/shlibs        | 12 ++++++------
 srcpkgs/icu/template |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..8d1e95f063ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..a05d0a7d35a8 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,20 +2,21 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
-revision=2
+version=69.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"

From c4549d5fd5dca78f3c062cdea21cd31bdec3e924 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 377/825] OpenRCT2: rebuild for icu-69.1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 761da7f1e580..8eeb3f75b528 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
 version=0.3.4.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 8c385227b7d03b901e35849931fc87fb01be0235 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 378/825] R: rebuild for icu-69.1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From 560545bf26b57e43795d8391010c0f9cf9e0a06b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 379/825] an: rebuild for icu-69.1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 57b0ea1b1beaf1f9abdac1714929173622368f3c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 380/825] boost: rebuild for icu-69.1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From 5600ed3a509752c2eb77000b0573d0964b379b5a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 381/825] brltty: rebuild for icu-69.1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From 40b52420b872910a9e31a4452fcabf9c084d76d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 382/825] calibre: rebuild for icu-69.1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From f6939f9ef490e2f94e478db63c12ea4310319d37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 383/825] clamav: rebuild for icu-69.1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From af05df86a979735e827307592b4785e45a887ba9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 384/825] darktable: rebuild for icu-69.1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 7c694d6277f3bf1167c0c9803e32707756ef2566 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 385/825] dino: rebuild for icu-69.1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From 62e9b8bd48c7df10718ef65e1ab63d969540027d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 386/825] dwdiff: rebuild for icu-69.1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From 1a26307d900d57ce2630bc74d4dc6050a9f86295 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 387/825] enchant2: rebuild for icu-69.1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..59413b958747 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;

From 1ee96f8e5cec8e7aefbbf23bc91829de656ce487 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 388/825] evolution-data-server: rebuild for icu-69.1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF

From 44060d639dba1d3dec0c90cc8b0bc759a2107788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 389/825] firefox: update to 91.0, rebuild for icu-69.1

---
 srcpkgs/firefox/patches/lto-thin.patch | 19 +++++++++++++++++++
 srcpkgs/firefox/template               |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch

diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 08c8efadf2d9..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 

From 687a9ff5333e50f957ce7e66a9d199e148caefd2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 390/825] firefox-esr: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 

From 7443a6acf71c9087c5f21d620580d26e4591d3f5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 391/825] freshplayerplugin: rebuild for icu-69.1

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 14bc44f343cc6c2e5fc64165542871fe10e6ad8d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 392/825] geary: rebuild for icu-69.1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 3891e7190112..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From a8db0d519894f75d3e2a8227f92d25a539fe5adf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 393/825] gnucash: rebuild for icu-69.1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From be23e25c8c7e59a29eb6544fa1e51050e0c89017 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 394/825] gnustep-base: rebuild for icu-69.1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From 80f2e43f8255928643169197b9fdf7b284ab9005 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 395/825] gnustep-gui: rebuild for icu-69.1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From ecc8ba93cdaa88330e6d1320ec734fc51f21c0a8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 396/825] harfbuzz: rebuild for icu-69.1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 106a44ff3139..6964948610fa 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=2.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled

From 8c788e2e7e4911c5a67a9d979989a1f72fc313a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 397/825] icu4lua: rebuild for icu-69.1

---
 srcpkgs/icu4lua/patches/icu-68.patch | 94 ++++++++++++++++++++++++++++
 srcpkgs/icu4lua/template             |  2 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch

diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From ca6f50d6295beb8b1ab34b8c94f94b7e7d6f8d05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 398/825] imv: rebuild for icu-69.1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 608cc8790641..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel

From eafc433260925863d115c5458f6f9f85f922ae0c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 399/825] kdb: rebuild for icu-69.1

---
 srcpkgs/kdb/patches/kdb-fix-build.patch    | 67 ++++++++++++++++++++++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch | 33 +++++++++++
 srcpkgs/kdb/template                       |  2 +-
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch

diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From c791aa5a9da9a9cf6d02ee2a16ae97e51e639f0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 400/825] kiwix-lib: rebuild for icu-69.1

---
 srcpkgs/kiwix-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then

From 72da42678cbf642df5c88032697bff184cbbcaed Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 401/825] libbitcoin-blockchain: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-blockchain/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From b8653dde3b601f755def2f9833a3f5d6844be28d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 402/825] libbitcoin-client: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"

From 37cf88d14901a8dfbed00cec9f6b0b3d4f85c9a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 403/825] libbitcoin-database: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-database/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 00387d8218cfd2802b1e569125687ea8f7eeedd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 404/825] libbitcoin-explorer: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-explorer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 8ef76648c9f8af99642f6bb85c4374625979de98 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 405/825] libbitcoin-network: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-network/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 14328fc0c5e7951cc790271663dbf0f6c02a4776 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 406/825] libbitcoin-node: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-node/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From e7dfdaf30dfb63f0c2bc65ad7969cc6fb2d500e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 407/825] libbitcoin-protocol: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-protocol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 0376fc4f6f0582e5c81ca2591c4e0839f94704d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 408/825] libbitcoin-server: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 7cf55657419eef3fceb69a03304f9f7ab5525b8f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 409/825] libbitcoin-system: rebuild for icu-69.1

---
 srcpkgs/libbitcoin-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png

From 27a641f1ee42fb466f0f6ab5cca091ff86d12120 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 410/825] libcdr: rebuild for icu-69.1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 2961ee0600e0d074b9fff9b2a7bf32ccbbac516a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 411/825] libe-book: rebuild for icu-69.1

---
 srcpkgs/libe-book/patches/icu-68.patch | 20 ++++++++++++++++++++
 srcpkgs/libe-book/template             |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch

diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From eaeb78bd3853c49cede9fcf2186c04aac98a32cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 412/825] libgdal: rebuild for icu-69.1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From e1442521f03b8862cc3f8515f5aa857d8ca65bc1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 413/825] libical: update to 3.0.10, rebuild for icu-69.1

---
 srcpkgs/libical/patches/fix-cross.patch | 58 +++++++++++++++++++------
 srcpkgs/libical/template                |  7 ++-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"

From 5c7b1a847913e847d2bfaeca37360651a3cca821 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 414/825] liblcf: rebuild for icu-69.1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 3c5670777aa429af95ab04d53dbf0e81159a7b05 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 415/825] libmspub: rebuild for icu-69.1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From 0a42637e8f5bd39f3d9ec751eb6468d60f64f229 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 416/825] libpsl: rebuild for icu-69.1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From f565756f1baff450fe9a9f11e18b7cd6cb846477 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 417/825] libqxp: rebuild for icu-69.1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From f103f06410f027709aff6e903b9ceaf0b9a7b7ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 418/825] libreoffice: rebuild for icu-69.1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 334026e6ecce8f1533e0222b01127eb4b668b371 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 419/825] libvisio: rebuild for icu-69.1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From bc867cd8d3ded35cfa1ac194f301b2fb2a6f8307 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 420/825] libxml2: rebuild for icu-69.1

---
 srcpkgs/libxml2/patches/icu-68.patch | 25 +++++++++++++++++++++++++
 srcpkgs/libxml2/template             |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch

diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From 9c4fdbac3b4e2430aec081051a82eb5e0b2ff167 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 421/825] libzim: rebuild for icu-69.1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 3b0c4fc3d3737b540f71d19f9788a3d1161ea10f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 422/825] maim: rebuild for icu-69.1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 2f221605158eb2704bb3f944009f4dea92172da5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 423/825] modsecurity: rebuild for icu-69.1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From 114e04702a3a9dc8c5932e54b9798e76287f1790 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 424/825] mozjs78: rebuild for icu-69.1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 8e4ce04fde983b40c5b0957808daf53bc67c2e22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 425/825] ncmpcpp: rebuild for icu-69.1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From b6fa357254b17c3156575b83246f158f5c9eff52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 426/825] nodejs: rebuild for icu-69.1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From 71ecb42ee2265131b10f645392180e39984e1acf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 427/825] nodejs-lts: update to 12.22.4, rebuild for icu-69.1

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"

From 10fc60699a24834c5f076c5f4fe69880e5e30c60 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 428/825] nodejs-lts-10: remove

---
 srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ---
 srcpkgs/nodejs-lts-10/patches/ppc32.patch   | 29 -------
 srcpkgs/nodejs-lts-10/patches/ppc64.patch   | 41 ---------
 srcpkgs/nodejs-lts-10/template              | 96 ---------------------
 srcpkgs/nodejs-lts-10/update                |  2 -
 5 files changed, 182 deletions(-)
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update

diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"

From d737aa0e965236395e114ee623bf623bf368fa19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 429/825] nuspell: rebuild for icu-69.1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From c6bb1bd924b1d161e18036e83294ae00b5313e99 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 430/825] openttd: rebuild for icu-69.1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes

From 7f6bc9d74004a013a9b2d48d52e3ac1a7a79bfa9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 431/825] peaclock: rebuild for icu-69.1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From 5d7fe94a63716944c081cfff6694e6501c4df408 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 432/825] perl-XML-LibXML: rebuild for icu-69.1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From 0c5b8a3423c6de345bba7ca680d1513bf1742891 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 433/825] php: rebuild for icu-69.1

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From f5882a3c7deba70adeb1a6b13594a655bcc72a94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 434/825] poedit: rebuild for icu-69.1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From a573fba5f9fcd1d4f658e4a0620cb4633c3cf2a0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 435/825] postfix: rebuild for icu-69.1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4dc1b9e5dad8..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.6.2
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From f71297c131d9b8ff0a8543487693b3f5607bf683 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 436/825] python3-PyICU: rebuild for icu-69.1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a8c8c6d8ef5f4f7fbefc73d626868c45cdb0745e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 437/825] qalculate: rebuild for icu-69.1

---
 srcpkgs/qalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 4d9e490bf26d..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
 # and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From 2cf41bac040232044e282e42f10fc05e396dabdf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 438/825] qt5: rebuild for icu-69.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..ca47cb6952b4 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From 3e433c36917d2a0c4ed541b45f473475ba584174 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 439/825] qt5-webkit: rebuild for icu-69.1

---
 srcpkgs/qt5-webkit/patches/glib-2.68.patch |  26 ++++
 srcpkgs/qt5-webkit/patches/icu-68.patch    | 170 +++++++++++++++++++++
 srcpkgs/qt5-webkit/template                |   2 +-
 3 files changed, 197 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch

diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

From d39f5d1389c1539ce19b250a4ed1cbd29e1836d3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 440/825] qt6-base: rebuild for icu-69.1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..d877eeb9b3a3 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6

From dc2ef100defcd309348c82fee296248d4fe644ca Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 441/825] qt6-qt5compat: rebuild for icu-69.1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "

From d7fb395c5e12831b060791b3a465bba77db2722b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 442/825] rspamd: rebuild for icu-69.1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From fb46418936e99d26a8bde242c842d19ac7273134 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 443/825] scribus: rebuild for icu-69.1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 359f27369af0bb32103e8bb4aa75be42c3b0a8a2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 444/825] sile: rebuild for icu-69.1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From 81a3f973d659bd719d91d8bd3ac1e85c019307d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 445/825] slop: rebuild for icu-69.1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From 23fabac1665d34b64811f890014c20547fecb969 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 446/825] sword: rebuild for icu-69.1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From a643d91d25cedb91da045ec523264484d413bba5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 447/825] tectonic: rebuild for icu-69.1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"

From 20722439975192b7c79d5800c8ae214a508d4cc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 448/825] tepl: rebuild for icu-69.1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"

From df53563d80e22647834579c0fe8665543ef8dfc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 449/825] tesseract-ocr: rebuild for icu-69.1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From a0776bc2c66d1cd5007dfda5bea7ac98b064c959 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 450/825] texlive: rebuild for icu-69.1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From db6239236042ad43e262f0ea277344035ddf1b78 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 451/825] thunderbird: update to 78.13.0, rebuild for icu-69.1

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 

From 6c6206d0c86c944def8cc0b12a3a2e5ddfffc7c2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 452/825] tracker: rebuild for icu-69.1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From 1e7fc3fef814e42892579089f1cfa41333bf9cb1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 453/825] tracker-miners: rebuild for icu-69.1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 4531b1f9cdd97a7560e369ffbd145537fcede803 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 454/825] tracker3: rebuild for icu-69.1

---
 srcpkgs/tracker3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"

From be49e823d8a6e919b332f5aba5cf2093c0bf9b3d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 455/825] tracker3-miners: rebuild for icu-69.1

---
 srcpkgs/tracker3-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss

From 05537c8cf4ca987406aa7b25fddd36a003921370 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 456/825] unar: rebuild for icu-69.1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 542c6c75608d3ded60bb356726f5eb8b2078c788 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 457/825] vte3: rebuild for icu-69.1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From 3f3897bc64ecfe902f0fa26ef702d9cdec119768 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 458/825] webkit2gtk: rebuild for icu-69.1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..bbe0d8ddca86 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From 44eedad7ebf46367d6542370b91557ba31b6e396 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 459/825] widelands: rebuild for icu-69.1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include

From 1f23a81c439d175654ee3483062a959129161dc9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 460/825] xerces-c: rebuild for icu-69.1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From fd491ddc30c15adc36b72f9a9616074fe70f0a7f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 461/825] yaz: rebuild for icu-69.1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From 35cec78e3b710031c4b1de1c4f1b3aa81270cd13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 462/825] znc: rebuild for icu-69.1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python

From 0526ac42096ee6cb8ea4dfbdef79e79f22a4306f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:57:08 +0200
Subject: [PATCH 463/825] removed-packages: drop nodejs-lts-10

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fa919b6de59b..cf88a864cba9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -320,6 +320,7 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 9678af1819608e07fd0aaa6569921218f5ad2eaa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 15:01:15 +0200
Subject: [PATCH 464/825] rstudio: switch nodejs-lts

---
 srcpkgs/rstudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel

From 139e78849548a200dddb797b7f23f2d1b95df443 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:08:27 +0200
Subject: [PATCH 465/825] firefox-esr-i18n: update to 78.13.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"

From ee71be1b59bb2fffafd61635e36c2725e2c384c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 466/825] qt5-webengine: update to 5.15.5, rebuild for icu-69.1

---
 .../patches/0120-QTBUG-91773.patch            | 372 ------------------
 .../0200-invalidate-old-v8-cache.patch        |  31 --
 srcpkgs/qt5-webengine/template                |  16 +-
 3 files changed, 9 insertions(+), 410 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch

diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"

From 536a35621a2e1ba51862ebc5f9f81a54e48f28f3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:51:45 +0200
Subject: [PATCH 467/825] firefox-i18n: update to 91.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 755b02d248c0..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0.1
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
- 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
- a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
- 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
- ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
- 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
- d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
- ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
- 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
- ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
- 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
- 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
- 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
- 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
- bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
- 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
- e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
- cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
- 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
- df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
- 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
- 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
- cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
- dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
- 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
- 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
- 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
- c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
- b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
- 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
- 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
- b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
- 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
- e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
- 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
- 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
- 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
- e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
- 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
- befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
- e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
- 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
- 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
- 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
- ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
- d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
- f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
- 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
- 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
- db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
- a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
- d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
- fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
- c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
- a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
- a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
- c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
- b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
- 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
- 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
- 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
- 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
- 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
- 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
- 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
- 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
- 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
- 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
- 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
- a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
- b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
- 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
- a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
- a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
- cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
- dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
- 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
- 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
- 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
- b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
- 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
- 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
- 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
- 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
- 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
- c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
- f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
- e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
- e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
- 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
- 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
- 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
- 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
- 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
- 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
- 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"

From c5b64c645023d56873c2aba234f5c86756dd9bce Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 468/825] 0ad: patch spidermonkey 78.6 for rust>=1.50, rebuild
 for icu-69.1.

Necessary in order to rebuild 0ad for libfmt.so.8.
---
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 ++++++++++++++++++
 srcpkgs/0ad/template                          |   2 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
new file mode 100644
index 000000000000..95007b32f25e
--- /dev/null
+++ b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
@@ -0,0 +1,107 @@
+From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
+From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
+Date: Sat, 27 Feb 2021 09:31:17 +0000
+Subject: [PATCH] Patch SM78.6 for Rust 1.50
+
+Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
+(this fix is integrated in SM78.8)
+
+Reviewed By: s0600204
+
+Differential Revision: https://code.wildfiregames.com/D3590
+
+
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
+---
+ libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
+ libraries/source/spidermonkey/patch.sh        |  4 ++
+ 2 files changed, 69 insertions(+)
+ create mode 100644 libraries/source/spidermonkey/FixRust150.diff
+
+diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
+new file mode 100644
+index 00000000000..cfb0d58b4a0
+--- /dev/null
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
+index 58be1fbdef0..879964b0f2e 100644
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..f6e6b41899de 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 2e3294fbfd45717df6e5436631be431e3c6451a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 10 Aug 2021 23:08:09 -0300
Subject: [PATCH 469/825] R-cran-stringi: update to 1.7.3, rebuild for icu-69.1

---
 srcpkgs/R-cran-stringi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE

From e88802f7a1571c6a51a8005d5ecb70669dc40c59 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 Aug 2021 15:12:39 +0200
Subject: [PATCH 470/825] thunderbird-i18n: update to 78.13.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"

From a51ce0bff41274f7fffb76220be57c9428ff13d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 11:27:22 -0300
Subject: [PATCH 471/825] qt6-base: only add self to hostmakedepends for cross

Tools other than xbps-src might get confused and assume a build cycle,
even if xbps-src can deal with it.
---
 srcpkgs/qt6-base/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d877eeb9b3a3..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"

From e2708fbc0f6359cbf5737e76dfcade5360e4f84a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 11 Aug 2021 16:36:26 +0200
Subject: [PATCH 472/825] nodejs-lts-10: remove stale symlink

---
 srcpkgs/nodejs-lts-10-devel | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/nodejs-lts-10-devel

diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file

From 4ccd4d2cb36fdb1051e85f411d1c5082c4bfb4aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 3 Jul 2021 12:04:04 +0200
Subject: [PATCH 473/825] ripright: build with imagemagick7

---
 srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++
 srcpkgs/ripright/template                   | 14 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch

diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}

From f4f9230d80702d859c23254fea4e11d18b6985ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Aug 2021 22:05:44 +0200
Subject: [PATCH 474/825] New package: hello-2.10

---
 srcpkgs/hello/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/hello/template

diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b

From fd722dcdfdec5ece8560194886429fe0ba5568af Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@beckmeyer.us>
Date: Thu, 15 Apr 2021 21:30:58 -0400
Subject: [PATCH 475/825] nginx: configure with dynamic module support

---
 srcpkgs/nginx/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \

From 601649d05d5103cf63a56742bcbbb95efa0c506b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:18:27 +0300
Subject: [PATCH 476/825] spdx-licenses-list: update to 3.14.

Also fix license (thanks @paper42).
---
 common/travis/license.lst           | 14 ++++++++++++++
 srcpkgs/spdx-licenses-list/template |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx

From 50179be2dc1e9ee25bab01a57410b1e8898d5951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 477/825] New package: CUnit-2.1.3

---
 srcpkgs/CUnit-devel    |  1 +
 srcpkgs/CUnit/template | 37 +++++++++++++++++++++++++++++++++++++
 srcpkgs/CUnit/update   |  1 +
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update

diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'

From e3682033ec656e30f2cb1390b9d9c512c374a718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 478/825] postgis: update to 3.1.3, enable unit tests

---
 srcpkgs/postgis/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From ec1db23bdbd1d066e41e328454479aa5da997f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 479/825] postgis-postgresql12: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql12/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From 15c007f9c99f56dadff9dbb6bc84d564950f221a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 480/825] postgis-postgresql13: update to 3.1.3, enable unit
 tests

---
 srcpkgs/postgis-postgresql13/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}

From b4f079cd60829e745888784e02c242deff8059bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 1 Jul 2021 23:21:49 +0200
Subject: [PATCH 481/825] mosquitto: enable tests

---
 srcpkgs/mosquitto/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }

From 8db1ca112ad9ee9177a714d59fc2c879af0b0c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 Aug 2021 20:46:25 +0200
Subject: [PATCH 482/825] README.md: put chroot style information together,
 extend

---
 README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 

From d030b0e220630fa68da90f67878bc01b813455ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Wed, 11 Aug 2021 14:33:40 +0200
Subject: [PATCH 483/825] intellij-idea-ultimate-edition: update to 2021.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)

From 5a25fe84db5f0bbbf2c5915ae76d9c3a1a52abe4 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 12 Aug 2021 00:12:28 +0100
Subject: [PATCH 484/825] chezmoi: update to 2.1.5.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE

From d10d5af1bdd8775b25d369b70f51a6e56abf64d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 485/825] qt5: add libxml2-devel to makedepends

Trying to reorder cross-build.
Transitively dependencies via libxslt-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ca47cb6952b4..935a156b7d48 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel

From f8f90ca8d05ba3a914de0fb96acdcd4ec23b64e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 10:27:07 +0700
Subject: [PATCH 486/825] qt5: add libxml2-devel to hostmakedepends

Trying to reorder cross-build.
Transitively dependencies via wayland-devel.
---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 935a156b7d48..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 

From 6b5a98bca31cfae98bb5cc99e0820b18b58d96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:16:15 +0700
Subject: [PATCH 487/825] harfbuzz: makedepends+=libxml2

Force builder to use staging libxml2
---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 6964948610fa..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -7,7 +7,7 @@ build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"

From b76f5bef8c7df303e8d20b67a209e65ce4a33ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:24:31 +0700
Subject: [PATCH 488/825] webkit2gtk: hostmakedepends+=libxml2-devel

See previous commit.
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index bbe0d8ddca86..951c1c9ee5ee 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From 3c9f521c95bbe9dff92dbeba71413d5fc7ab920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 16:31:19 +0700
Subject: [PATCH 489/825] webkit2gtk: hostmakedepend+=libpsl

Force libpsl from staging, (geoclue2->libsoup-gnome->libsoup->libpsl)
---
 srcpkgs/webkit2gtk/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 951c1c9ee5ee..837fd8130803 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel

From fa7e812d6f7dcbbd405ead900b878eabf5c90fc7 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Wed, 11 Aug 2021 23:11:31 -0300
Subject: [PATCH 490/825] icewm: update to 2.7.0.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 

From ea67c70c19c319611de0a7af1ddce7691b02964d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:17:08 +0400
Subject: [PATCH 491/825] osinfo-db: update to 20210809.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From ad4b4b362ecae61007d6258da79e0a918995fa6c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:25:10 +0400
Subject: [PATCH 492/825] benchmark: update to 1.5.6.

---
 srcpkgs/benchmark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e45c13ae7ec955da50eb01a223661555ed968f28 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 12 Aug 2021 09:11:39 +0400
Subject: [PATCH 493/825] python3-regex: update to 2021.8.3.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 83f291af2d03439cda2818210bf961d1f29769a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 11 Aug 2021 00:03:54 +0300
Subject: [PATCH 494/825] skype: update to 8.75.0.140.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index d8e2f3a77606..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.74.0.152
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=1b19fbb55c75815c78e9c20ed29a97c6b11c8b45a2444dd8f1aa51d7ca354039
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 

From 33f01abd29e96c0fa6c4cb481016bde8f5ea1651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 11 Aug 2021 22:46:55 -0300
Subject: [PATCH 495/825] ptii: remove package.

Distfiles were never available officially. The git repo in [1] still
works, but seems inactive, and the homepage no longer works.

[1] git://z3bra.org/ptii
---
 srcpkgs/ptii/patches/fix-installpaths.patch | 15 ---------------
 srcpkgs/ptii/template                       | 14 --------------
 srcpkgs/removed-packages/template           |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template

diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index cf88a864cba9..c9349197c278 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -230,6 +230,7 @@ replaces="
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
  psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4

From cd7fd20f07f9a0632bf93e34ed6e517d99d47fa9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 09:45:43 +0300
Subject: [PATCH 496/825] protontricks: update to 1.6.0.

---
 srcpkgs/protontricks/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}

From bbf15689d99be25b5d9609ad095c2b7199cd39f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 9 Aug 2021 20:28:29 +0200
Subject: [PATCH 497/825] libfilezilla: update to 0.31.1.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8d1e95f063ec..f96d3f36b3ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2588,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 290f5d1501b8c0881e2a36cc78f0c028626cb8d2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 16:29:47 +0200
Subject: [PATCH 498/825] filezilla: update to 3.55.1.

---
 srcpkgs/filezilla/patches/libtool_tag.patch | 11 -----------
 srcpkgs/filezilla/template                  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch

diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d4014c75337f83717f2fe87797b14b7d82955f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 21:32:12 +0700
Subject: [PATCH 499/825] OpenRCT2: makedepends+=libxml2-devel

Transitive via SDL2-devel -> wayland-devel
---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 8eeb3f75b528..1f4738bdc46a 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"

From a1eb1dbb92cd6490cb5b8e8fe2733dd3e53bbb12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 12 Aug 2021 22:03:55 +0700
Subject: [PATCH 500/825] OpenRCT2: force some hostmakedepends from staging for
 icu rebuild

---
 srcpkgs/OpenRCT2/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 1f4738bdc46a..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 

From 3dc283c7c23c6632ddfbfc6218212a666bb97ed9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:17:03 +0200
Subject: [PATCH 501/825] warzone2100: update to 4.1.3.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index d878605ff26a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.2
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=34964a97452a5b57ed3993ce8365cbf47fcdbd08b7529b1582c02db5b9862240
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From b7bf44e1a89aa5fecf2eba4b666b025fa892d4cc Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:21:19 +0200
Subject: [PATCH 502/825] linux5.4: update to 5.4.140.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index c204d64759c3..9316ea45e0a8 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.138
+version=5.4.140
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657
+checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 195ad0a4ed8201c3c43176397b77a01c6d097cbf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:23:51 +0200
Subject: [PATCH 503/825] linux4.19: update to 4.19.203.

---
 srcpkgs/linux4.19/template  |   4 +-
 srcpkgs/linux4.19/templateu | 331 ++++++++++++++++++++++++++++++++++++
 2 files changed, 333 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/linux4.19/templateu

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index b79ed782a91c..914f8f45b75f 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.201
+version=4.19.203
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}

From b52d8d996acb8d4b9aac680a0230866a21596e04 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 12 Aug 2021 17:26:58 +0200
Subject: [PATCH 504/825] linux5.13: update to 5.13.10.

---
 srcpkgs/linux5.13/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 2c8c80b9945f..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.9
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 358da3bbe06ad323c4d0fec4fc8d755a07733ea69363101913fdd6056878113d"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 8ee1ab3b5123e860aff832fe1b00a2f2fa5b9a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:31:43 -0400
Subject: [PATCH 505/825] python3-ciso8601: update to 2.2.0.

---
 srcpkgs/python3-ciso8601/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE

From 42435f958a5fa83a270588649d1087fa1d51a798 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:32:02 -0400
Subject: [PATCH 506/825] python3-tifffile: update to 2021.8.8.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 0e9e467e1564..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.30
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=86a659791205281b5b75f21b608f28d1c8d669911693796dbe1524494056ec9c
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 

From 3decb15651195ddd18fcf1d926ee8dfaf0b89927 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:35:35 -0400
Subject: [PATCH 507/825] xpra: update to 4.2.2.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 8f99848d6d57e992173fd15ce2bf6805158f6ffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 Aug 2021 08:37:27 -0400
Subject: [PATCH 508/825] python3-uvloop: update to 0.16.0.

---
 srcpkgs/python3-uvloop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient

From 31486f9f61c9282f4255f4abf3c0995a5298c2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:12 +0200
Subject: [PATCH 509/825] postgresql: update to 9.6.23, adopt.

---
 srcpkgs/postgresql/template | 8 ++++----
 srcpkgs/postgresql/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 6c30501a7c61..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"

From aed625668acd6d519e54907c20efd93b562c6386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:13 +0200
Subject: [PATCH 510/825] postgresql12: update to 12.8.

---
 srcpkgs/postgresql12/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bd3c6efc791346a273eaafad2a7ccab06ba9c498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 12 Aug 2021 18:45:14 +0200
Subject: [PATCH 511/825] postgresql13: update to 13.4.

---
 srcpkgs/postgresql13/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql

From bfc6885ffbe6fd49b8b9166c284695210f545012 Mon Sep 17 00:00:00 2001
From: Justin Hibbits <chmeeedalf@gmail.com>
Date: Thu, 12 Aug 2021 13:20:16 -0500
Subject: [PATCH 512/825] claws-mail: update to 3.18.0

---
 srcpkgs/claws-mail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From b5751c606cf8fe914d994482d8989f65aeef28f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 12 Aug 2021 21:50:39 +0200
Subject: [PATCH 513/825] Aegisub: rebuild for icu

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)

From fbf27a5a0ca5bcc8986b3ac52626cf827c445405 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:02:33 +0200
Subject: [PATCH 514/825] unbound: update to 1.13.2.

---
 srcpkgs/unbound/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {

From 6903859b90dc79aa413e9d329388bbb453757147 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:04:55 +0200
Subject: [PATCH 515/825] k9s: update to 0.24.15.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"

From 5e0531b83dc6009199dc96bd7493ebc67b54fa61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:07:05 +0200
Subject: [PATCH 516/825] skaffold: update to 1.30.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 663f97e1f5f0..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.29.0
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=f12b1f608e8f7095bc5976c40c0c80417ee0a24ae7752012f51074539f311046
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764

From 4ad44630337495dceb4fd1ceb2ea465e48644037 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 12:11:48 +0200
Subject: [PATCH 517/825] netpbm: update to 10.95.01.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc

From 4a23979ca3b2ba8d84ff63ea0463d573d5586114 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Wed, 11 Aug 2021 02:42:38 +0200
Subject: [PATCH 518/825] libXft: update to 2.3.4

---
 srcpkgs/libXft/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING

From b262c7ceab89d11cbb09b50b49fd28250587de89 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 Aug 2021 22:14:29 +0200
Subject: [PATCH 519/825] dovecot: remove INSTALL{,.msg}, we don't ship a
 default config anymore

---
 srcpkgs/dovecot/INSTALL     | 9 ---------
 srcpkgs/dovecot/INSTALL.msg | 6 ------
 srcpkgs/dovecot/template    | 2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg

diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 27a781db5139..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From 8ce3d75f5dd89c33bd033499d8d16daa2a332709 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 5 Aug 2021 22:48:55 -0700
Subject: [PATCH 520/825] CLion: Fix removal of files for unsupported OS/archs

---
 srcpkgs/CLion/template | 43 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index f2ab575cea34..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
 version=2021.2
-revision=1
-archs="i686 x86_64"
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -25,36 +25,37 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/arm
-	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/ppc64le
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
 	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
 	rm -rf plugins/performanceTesting/bin/yjpagent.dll
 	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
 	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
+	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
+	rm -rf lib/pty4j-native/linux/ppc64le
+
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/performanceTesting/bin/libyjpagent.so
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
 			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so

From 6635ad2495e6000853247d34f5a19d1d05e6b417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 09:46:45 +0700
Subject: [PATCH 521/825] icu: build static with -fPIC

---
 srcpkgs/icu/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index a05d0a7d35a8..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -3,7 +3,7 @@
 #       next soname bump.
 pkgname=icu
 version=69.1
-revision=1
+revision=2
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -18,6 +18,9 @@ homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
 checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
 
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
 fi

From e234634ed2daa31a2bce7585235d77c84a87fb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 13:35:07 +0700
Subject: [PATCH 522/825] enchant2: makedepends+="icu-devel"

Transitive via nuspell-devel anyway.
---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 59413b958747..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9f49b7f83f0426aa50b278813e2df6113a2d8b33 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 Aug 2021 12:51:06 +0200
Subject: [PATCH 523/825] linux5.10: update to 5.10.58.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6242d17550e8..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.56
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 93743856c7fd206837251863e004792d05994454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 13 Aug 2021 19:11:28 +0700
Subject: [PATCH 524/825] webkit2gtk: makedepends+= libnuspell-devel
 libpsl-devel

Via libsoup-devel and enchant2-devel
---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 837fd8130803..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -30,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"

From 8000175a12865c52db1534925823ec0418c8dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 Aug 2021 16:26:57 +0700
Subject: [PATCH 525/825] nss: update to 3.69.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 69a8fcc086acf2b39f836bc99f1309ec73dc8d7a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:10:17 +0200
Subject: [PATCH 526/825] thermald: update to 2.4.6.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 4dad19ff8b6f51c6f6972c88e3abf8ef79a82587 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:11:21 +0200
Subject: [PATCH 527/825] terraform: update to 1.0.4.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6

From f4c4d7d16dc07a8feb4047497af40b4b0bb8fc60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:13:38 +0200
Subject: [PATCH 528/825] terragrunt: update to 0.31.4.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt

From d5394b4d94931f5e69b411f228501f8afcbed75d Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:15:31 +0200
Subject: [PATCH 529/825] hugo: update to 0.87.0.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 03cdeb450eae..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.86.1
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9e4b65249c890945b542d1e2737bdc3cb2240cc9ad081670ae5a65543002f90a
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md

From 1dae0b40ce7d6fccc56e122d1492d4f8e7c8773a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:19:37 +0200
Subject: [PATCH 530/825] hopper: update to 4.8.2.

---
 srcpkgs/hopper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes

From dbd04054d8c7f8123bf6342601e915de8c285275 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:20:03 +0200
Subject: [PATCH 531/825] hivex: update to 1.3.21.

---
 srcpkgs/hivex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 1ed578d92e17..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,6 +1,6 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.20
+version=1.3.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f523c37bb064a4bab7db5224902c34eee4f9fab2d9b81cf615b32c0b8509d32d
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes

From 17ca3f128a2307f8e30194efa3ac88877e0c210b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 13 Aug 2021 17:36:28 +0200
Subject: [PATCH 532/825] iio-sensor-proxy: update to 3.1.

---
 ...heck-for-.pc-files-before-using-them.patch | 32 -------------------
 srcpkgs/iio-sensor-proxy/template             | 13 +++-----
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch

diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy

From a8b2089377cf66f79a90ed008a920a5c754ce3cf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 20:46:17 +0200
Subject: [PATCH 533/825] libkdcraw5: update to 21.08.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7908f9a215df4a1fbea2fa945fc0051c38d8eba6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 Aug 2021 21:14:33 +0200
Subject: [PATCH 534/825] gwenview: update to 21.08.0.

---
 srcpkgs/gwenview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19

From d9f91db631b7e3baf864c159158c7e3e0d543dc3 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 12 Aug 2021 22:20:02 +0530
Subject: [PATCH 535/825] Komikku: add patch from upstream

---
 srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ++++++++++++++++++++++
 srcpkgs/Komikku/template                   |  2 +-
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch

diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 7a612602214d..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.30.0
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From 9212918f8838f5debf3c73d7ac2f456d39053bf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 3 Aug 2021 08:56:18 +0300
Subject: [PATCH 536/825] xf86-video-amdgpu: update to 21.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }

From ef0f5863d8a296c84f4328fba1b97fe84e8ad25e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:37:05 +0200
Subject: [PATCH 537/825] meld: update to 3.20.4.

---
 srcpkgs/meld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \

From 1a82699f5d2a897ef28951897761d1656e024cc3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:07 +0200
Subject: [PATCH 538/825] 0ad-data: update to 0.0.25.

---
 srcpkgs/0ad-data/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in

From f040aff7bfacdaa61e87b9303f80a9ba16266f8e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 13:43:24 +0200
Subject: [PATCH 539/825] 0ad: update to 0.0.25.

---
 srcpkgs/0ad/patches/ppc64.patch               | 113 ------------------
 .../patches/spidermonkey-78.6-rust-1.50.patch | 107 -----------------
 srcpkgs/0ad/template                          |   6 +-
 3 files changed, 3 insertions(+), 223 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch

diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
deleted file mode 100644
index 95007b32f25e..000000000000
--- a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001
-From: wraitii <wraitii@3db68df2-c116-0410-a063-a993310a9797>
-Date: Sat, 27 Feb 2021 09:31:17 +0000
-Subject: [PATCH] Patch SM78.6 for Rust 1.50
-
-Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-(this fix is integrated in SM78.8)
-
-Reviewed By: s0600204
-
-Differential Revision: https://code.wildfiregames.com/D3590
-
-
-
-git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797
----
- libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++
- libraries/source/spidermonkey/patch.sh        |  4 ++
- 2 files changed, 69 insertions(+)
- create mode 100644 libraries/source/spidermonkey/FixRust150.diff
-
-diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff
-new file mode 100644
-index 00000000000..cfb0d58b4a0
---- /dev/null
-+++ b/libraries/source/spidermonkey/FixRust150.diff
-@@ -0,0 +1,65 @@
-+
-+# HG changeset patch
-+# User Emilio Cobos Álvarez <emilio@crisal.io>
-+# Date 1609006565 0
-+# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-+# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
-+Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-+
-+Fixes errors like:
-+
-+  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-+
-+I've left the most specific dependency, but for wgpu the rev is not
-+right, so I've kept the branch which effectively preserves behavior.
-+
-+Differential Revision: https://phabricator.services.mozilla.com/D100485
-+
-+diff --git a/.cargo/config.in b/.cargo/config.in
-+--- a/.cargo/config.in
-++++ b/.cargo/config.in
-+@@ -1,16 +1,16 @@
-+ # This file contains vendoring instructions for cargo.
-+ # It was generated by `mach vendor rust`.
-+ # Please do not edit.
-+ 
-+ [source."https://github.com/shravanrn/nix/"]
-+-branch = "r0.13.1"
-+ git = "https://github.com/shravanrn/nix/"
-+ replace-with = "vendored-sources"
-++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ 
-+ [source."https://github.com/mozilla/rkv"]
-+ git = "https://github.com/mozilla/rkv"
-+ replace-with = "vendored-sources"
-+ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
-+ 
-+ [source."https://github.com/mozilla/neqo"]
-+ git = "https://github.com/mozilla/neqo"
-+diff --git a/Cargo.lock b/Cargo.lock
-+--- a/Cargo.lock
-++++ b/Cargo.lock
-+@@ -3200,7 +3200,7 @@
-+ [[package]]
-+ name = "nix"
-+ version = "0.13.1"
-+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+ dependencies = [
-+  "bitflags",
-+  "cc",
-+diff --git a/Cargo.toml b/Cargo.toml
-+--- a/Cargo.toml
-++++ b/Cargo.toml
-+@@ -60,8 +60,8 @@
-+ [patch.crates-io]
-+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
-+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
-+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
-+ # failure's backtrace feature might break our builds, see bug 1608157.
-+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-+
-diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh
-index 58be1fbdef0..879964b0f2e 100644
---- a/libraries/source/spidermonkey/patch.sh
-+++ b/libraries/source/spidermonkey/patch.sh
-@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
- patch -p1 < ../FixRpiUnalignedFpAccess.diff
- 
-+# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
-+# Note that this isn't quite the upstream patch to match our version.
-+patch -p1 < ../FixRust150.diff
-+
- # Patch those separately, as they might interfere with normal behaviour.
- if [ "$(uname -s)" = "FreeBSD" ];
- then
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f6e6b41899de..2e095d293a6a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
-revision=3
+version=0.0.25
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 

From d303ec56631d7e5e294752fba40b767c9546bb2d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 13:22:34 +0200
Subject: [PATCH 540/825] youtube-viewer: update to 3.9.4.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 631d508f2d7f227cbd47bf51fbbc1c2e80de865e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 14 Aug 2021 14:52:02 +0200
Subject: [PATCH 541/825] knot: update to 3.1.1.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 2188e92dac8b..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From 7c493688a8f472de21012b1cd47469115013408d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 14 Aug 2021 15:05:28 +0200
Subject: [PATCH 542/825] wine: update to 6.15.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 30be01e169b2..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.14/dlls/dnsapi/libresolv.c
-+++ b/wine-6.14/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index bb2fa789c7e7..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.14
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
- 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 4624952c79c5813577aef7ec2c948d9b0e9d77b6 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 7 Aug 2021 10:17:38 -0600
Subject: [PATCH 543/825] combine mu and mu4e packages and update to 1.6.3

- combine mu and mu4e packages under (more discoverable) name "mu4e"
  - add `replaces`/`provides` for old "mu" package
- add option for optional guile components
- update to 1.6.3
---
 srcpkgs/mu/template   | 36 ------------------------------------
 srcpkgs/mu4e          |  1 -
 srcpkgs/mu4e/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template

diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 36d67ef65cba..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=1c9ca62c50f1f087c15aa94c6c02d206a7f297b7903dfdf67e1ced4460d7c784
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}

From 8f53dc8d60eb3b2e9da062cafeb5cfb409fac9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 544/825] filelight: update to 21.08.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4

From d753b84fb79b7266c1793e9fff39b443afc6cec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 545/825] kaccounts-integration: update to 21.08.0.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From f8128b7a9938cdeabbbc30181123d89a7a421712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 546/825] kaccounts-providers: update to 21.08.0.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 09f2a9c0ce337662bf17a1eb7e800cf320528df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 547/825] kcachegrind: update to 21.08.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2

From a523dbe991eacb2379ef1436aa43110160c2d87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:16 +0200
Subject: [PATCH 548/825] kcron: update to 21.08.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4

From 759a233dd267718e423b35d0ec16afc5efc0a3fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 549/825] kdialog: update to 21.08.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de

From 6fff1b8760ce35609febe12d11241b4f7de426ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 550/825] keditbookmarks: update to 21.08.0.

---
 .../patches/20.08.3--fix-tests.patch          | 28 -------------------
 srcpkgs/keditbookmarks/template               |  4 +--
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch

diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc

From 0ebc5d7c8fa2cc90a9faba8e87cb197fd71f7c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 551/825] kfind: update to 21.08.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461

From ca77c8b9e0de0769062b41ad6863ec8197ebf44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 552/825] kig: update to 21.08.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4

From 8d65798109dad3689363d30693c42ed2775c365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 553/825] kio-gdrive: update to 21.08.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa

From 6e9f98030fd77c3a95e0588410124bbb2115887a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 554/825] kmag: update to 21.08.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91

From c23c5eb633c0863d7c93470078ff540287d6b5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 555/825] kmix: update to 21.08.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad

From 04b2fa8bab48801e2a9c6c50b79e95821d32b5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 556/825] kolourpaint: update to 21.08.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING

From b67a82596d7e1e7db017bc73510539951ec39587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 557/825] kompare: update to 21.08.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4

From 55350a62182af8942d27ae750c34ddea3364ba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:17 +0200
Subject: [PATCH 558/825] kpat: update to 21.08.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2

From 07076e646b0321e9d99a5614fe2ea371a90af314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 559/825] kruler: update to 21.08.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af

From ec6e6a94dbd86906a4042717bcf0d4facc978605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 560/825] ksystemlog: update to 21.08.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2

From a67a78dcb80db1694f064b6489941a6bb30fd33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 561/825] kteatime: update to 21.08.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546

From f5301e3f9a2f13fbd723c55636bd141595839e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 562/825] kturtle: update to 21.08.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e

From a57b46c2a7e7b5c6cecdd159d5a0816bcffd8e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 563/825] kwalletmanager: update to 21.08.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963

From fbf62ded4171c457cfe742648e47113f9c68217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 564/825] libkcddb: update to 21.08.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 35b2baae3999832242fa7c48dd858cf75a090484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 565/825] libkdegames: update to 21.08.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f4c118f85c5f1b6a4534898367090d8566ec1b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 566/825] libkomparediff2: update to 21.08.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 819515e0d1f62b50225614992c4014fda5bfcc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 567/825] marble5: update to 21.08.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 40cc4d049a5ca782a967e89ae94efc0fe0ed8de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 568/825] signon-kwallet-extension: update to 21.08.0.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72

From 7369027cd40dd65dba61fb57ef4371cf363f891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:18 +0200
Subject: [PATCH 569/825] svgpart: update to 21.08.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102

From ec414ed70833a5b264fd0ad20d4212f0c7e465e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 570/825] umbrello: update to 21.08.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {

From c29ff7224c8b1a82658af9f323f07d0af6603294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 Aug 2021 16:07:19 +0200
Subject: [PATCH 571/825] yakuake: update to 21.08.0.

---
 srcpkgs/yakuake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 61d6e2e645c4..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,7 +1,7 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
-revision=2
+version=21.08.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e

From bbc686bb5d1319cc3b458e2ae19abd2373881839 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:45:03 +0200
Subject: [PATCH 572/825] linux4.19: update ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 068acd4303087f3926c48f8cccd71300c58552da Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:40:57 +0200
Subject: [PATCH 573/825] linux5.4: update ppc-dotconfig

---
 srcpkgs/linux5.4/files/ppc-dotconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set

From 39461a28097f52942e263a12c2021b141ffcd1bb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 14 Aug 2021 17:43:14 +0200
Subject: [PATCH 574/825] linux5.13: update ppc-dotconfig

---
 srcpkgs/linux5.13/files/ppc-dotconfig | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set

From bff15f3d98a9813dc6c26d5f43e23d51cc3acc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 22:49:10 +0700
Subject: [PATCH 575/825] apostrophe: depends on webkit2gtk

---
 srcpkgs/apostrophe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 10c5d6f1c414bd49cd9a5d846c20be1cd8ec952c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 14 Aug 2021 21:51:15 +0700
Subject: [PATCH 576/825] python3-pypandoc: update to 1.6.3.

---
 srcpkgs/python3-pypandoc/patches/no-pip.patch | 20 +++++++++++++++++++
 srcpkgs/python3-pypandoc/template             |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch

diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE

From cc8eb3744a96c36eda0584eaf8e812c2030c2ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:19 +0700
Subject: [PATCH 577/825] python3-usb: update to 1.2.1.

---
 srcpkgs/python3-usb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE

From e07d6dd0f6dbece44f014e7d9f21596d365cac5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:23 +0700
Subject: [PATCH 578/825] python3-elementpath: update to 2.2.3.

---
 srcpkgs/python3-elementpath/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling

From 49796352785b22c246aebf266afafe93ab24d05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:14:38 +0700
Subject: [PATCH 579/825] python3-pyscard: update to 2.0.1.

---
 srcpkgs/python3-pyscard/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 

From 2a4c01d6d395638493880bb818f171d441de03d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Jul 2021 12:13:50 +0700
Subject: [PATCH 580/825] sip: update to 6.1.1.

---
 srcpkgs/sip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From c6dd168e9c0795eac3ea033d8ecefabe74a0f95e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 Aug 2021 18:54:54 +0200
Subject: [PATCH 581/825] python3-boto3: update to 1.18.21.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE

From 4b2981744107e2329f4f93b7f295aaaa41b1ab00 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 18:36:44 +0200
Subject: [PATCH 582/825] onionshare: remove package

* doesn't work with Flask 2
---
 srcpkgs/onionshare/template       | 23 -----------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/onionshare/template

diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c9349197c278..3b1dbd467489 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -219,6 +219,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4

From ee853fe00a61519dfdd9651c42dcf74fcbab405c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:33 +0200
Subject: [PATCH 583/825] python3-urwidtrees: update to 1.0.3.

---
 srcpkgs/python3-urwidtrees/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a

From b51e816cc26325f4ba577655fe5d53b70f9d55e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 14:30:36 +0200
Subject: [PATCH 584/825] stig: update to 0.12.2a0, adopt

---
 srcpkgs/stig/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged

From caac0c84ee55556a6cb776e1d09331d802650176 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 11 Aug 2021 15:13:07 +0100
Subject: [PATCH 585/825] gopls: update to 0.7.1.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE

From d979203bdde59ded044446ea65e27008fc4a0fc0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 14 Aug 2021 20:39:23 +0200
Subject: [PATCH 586/825] ccextractor: update to 0.92

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {

From 78a59e5314e856d316585e4ffedcc71122f48a6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 Aug 2021 11:29:10 -0400
Subject: [PATCH 587/825] python3-matplotlib: update to 3.4.3.

---
 srcpkgs/python3-matplotlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From c31ffeda77396ed711c7d6e616c6a6b24975b83e Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sat, 14 Aug 2021 15:42:28 -0500
Subject: [PATCH 588/825] New package: vault-acme-0.0.8.

---
 srcpkgs/vault-acme/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/vault-acme/template

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}

From 2ee53f90094f0c2fa3213b7c6e1f3a54f6318b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 10 Aug 2021 19:56:34 -0300
Subject: [PATCH 589/825] pari: update to 2.13.2.

- enable pthreads build
- switch gp binary to static link libpari; this offsets the slowdown due
  to pthreads
- use -flto and -fno-semantic-interposition which improve speed a little
  bit more
- ship the static library, so external programs can static link
- change of maintainer agreed by sgn

I had to add a minimal patch to the makefile, so that the build step
builds and the install step installs. I will try to upstream that patch.
---
 common/shlibs                       |  1 +
 srcpkgs/pari/patches/makefile.patch | 36 +++++++++++++++++++++++++++++
 srcpkgs/pari/template               | 22 +++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/pari/patches/makefile.patch

diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..301649ded872 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3981,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

From ec9683ea5e257d5ac085ca9f6e3693341f86dfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:06:12 -0300
Subject: [PATCH 590/825] giac: revbump for pari

---
 srcpkgs/giac/patches/pari_2_13.patch | 16 ++++++++++++++++
 srcpkgs/giac/template                |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch

diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel

From c28d6c6bba4b9f1dde2203dae3e5231ce2fedf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 11 Aug 2021 18:13:17 -0300
Subject: [PATCH 591/825] qcas: revbump for giac

---
 srcpkgs/qcas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"

From 4e3ef46d6db0a74b28a5f10c72e4ba54700d6651 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 14 Aug 2021 23:34:04 +0200
Subject: [PATCH 592/825] sequeler: update to 0.8.2.

---
 srcpkgs/sequeler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876

From e78ea204eee7715310675231064fa709f830efdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:49 +0200
Subject: [PATCH 593/825] dolphin: update to 21.08.0.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From d78bf319fc55fb69538bfca0fab61d411277266c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:55 +0200
Subject: [PATCH 594/825] akonadi-calendar: update to 21.08.0.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c60065df21d701fc391e8047366dd8744d0f37dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:57 +0200
Subject: [PATCH 595/825] akonadi-contacts: update to 21.08.0.

---
 srcpkgs/akonadi-contacts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From 8d1093b15a98c6d186ba6fe7c88051cca4f62b39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:03:58 +0200
Subject: [PATCH 596/825] akonadi-import-wizard: update to 21.08.0.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 835db1dd9696474b57e7640b5b54a9f91d9e2e57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:00 +0200
Subject: [PATCH 597/825] akonadi-mime: update to 21.08.0.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 57761126efd9ad7bd7a87c815c976d8848cd918d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:01 +0200
Subject: [PATCH 598/825] akonadi-notes: update to 21.08.0.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 614fe6632bf9f86b8d3e1976ad65c1157fda93de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:02 +0200
Subject: [PATCH 599/825] akonadi-search: update to 21.08.0.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b864620d3eb685f9c1824bc90406e17ac4e3ffb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:04 +0200
Subject: [PATCH 600/825] calendarsupport: update to 21.08.0.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 63e06a6086cb2d6dd04f75e6664ec5b29ff05caf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:05 +0200
Subject: [PATCH 601/825] grantleetheme: update to 21.08.0.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 89c7debabf8b9c1df4c6c529e7c984e67d5797b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:07 +0200
Subject: [PATCH 602/825] kalarmcal: update to 21.08.0.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From fe440257543b665ca49274bdf7dfd91c8a69adb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:08 +0200
Subject: [PATCH 603/825] kcalutils: update to 21.08.0.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5f2f5b27675e6ff8fe02f1759a835d5e7739c1ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:10 +0200
Subject: [PATCH 604/825] kdepim-runtime: update to 21.08.0.

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 11131da4d33476ce2cd2902c26860716ee5e21c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:11 +0200
Subject: [PATCH 605/825] kimap: update to 21.08.0.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From cb3097c23cf363a91bed327dee9f1278daa8b3e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 606/825] kldap: update to 21.08.0.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e61c7cbf7fb6b0efd964adaa4fbd95be70a31e62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:13 +0200
Subject: [PATCH 607/825] kmail: update to 21.08.0.

---
 srcpkgs/kmail/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca

From 058a491eedd0f621e55cc64f7859cd88e39f866c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:15 +0200
Subject: [PATCH 608/825] kmail-account-wizard: update to 21.08.0.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93

From 94f06479a3992c016230089f355a3f87fd2ca448 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:16 +0200
Subject: [PATCH 609/825] kmailtransport: update to 21.08.0.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 26dd67a9164bc031c13a2ebee9b3dd54b317dc9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:17 +0200
Subject: [PATCH 610/825] kmbox: update to 21.08.0.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From de9d9c3b16fd6afdeb8e710f37963cf560326219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 611/825] kmime: update to 21.08.0.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 4ef06ca0dc38d489d551405d8cebf1085d5b0011 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:19 +0200
Subject: [PATCH 612/825] kde5-baseapps: update to 21.08.0.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="

From a4e744d183e561e3810d323bd78b5ff62ff225ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:20 +0200
Subject: [PATCH 613/825] kontactinterface: update to 21.08.0.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d27be916d104f83e756cd108a82d36dc6399ad0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:21 +0200
Subject: [PATCH 614/825] ksmtp: update to 21.08.0.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e0257d64cf740805fbdcadc5375bf0979821d7fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:23 +0200
Subject: [PATCH 615/825] ktnef: update to 21.08.0.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c54ec5382ea58e513b0ae3cd4b93168c2ebec9e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 616/825] kate5: update to 21.08.0.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 9cf6ba829ce663762c7e4e55f2a9cb6dd5e730d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:24 +0200
Subject: [PATCH 617/825] libgravatar: update to 21.08.0.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8797bd702e7f1cd1ceadb514e930cdd3604bfc2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:25 +0200
Subject: [PATCH 618/825] konsole: update to 21.08.0.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From bcb448211a2495d8066836723ca539ca64918cc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:26 +0200
Subject: [PATCH 619/825] libkdepim: update to 21.08.0.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 468616be217df0c41d6c5ed0cd0209ce3fa608d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 620/825] baloo-widgets5: update to 21.08.0.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From a0988bb2e9366cd3cc7a7e633ee6b611c88819ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:27 +0200
Subject: [PATCH 621/825] libkgapi: update to 21.08.0.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:

From 21f59b4873d5664f50ead6525aa7b915b34e4a7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:28 +0200
Subject: [PATCH 622/825] kio-extras: update to 21.08.0.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d

From a4aa6c2b95334d923f1399cab0c16608e061d51f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:29 +0200
Subject: [PATCH 623/825] libkleo: update to 21.08.0.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e960bdc1a56b15d16ec50a01e66e1fc8912d1e2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:31 +0200
Subject: [PATCH 624/825] okular: update to 21.08.0.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build

From d35ac3b69236c74957e71ac9466d5656eac94bc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 625/825] kleopatra: update to 21.08.0.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test

From 9de158a52808919d39908353ea7c00bf36bc2232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:32 +0200
Subject: [PATCH 626/825] libkexiv25: update to 21.08.0.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From b1d9dafc24f0f12a9fcf0b89abb44b02fb098965 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:33 +0200
Subject: [PATCH 627/825] libksieve: update to 21.08.0.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f043a73e4273a6bc0e3f84850878bc2e53a999f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:35 +0200
Subject: [PATCH 628/825] mailcommon: update to 21.08.0.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 1063c6ec22a0021d3db7a6880d95bd2084b76288 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:36 +0200
Subject: [PATCH 629/825] spectacle: update to 21.08.0.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3

From 1ff4996abe4ab41b343f315ca72b33824d0b83c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:38 +0200
Subject: [PATCH 630/825] libkipi5: update to 21.08.0.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 8fda997448eab42e1d93e705cb328b308e2a9688 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:39 +0200
Subject: [PATCH 631/825] messagelib: update to 21.08.0.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 

From 2775b48313e7e44f3789921c04c72a481277f643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:40 +0200
Subject: [PATCH 632/825] pimcommon: update to 21.08.0.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 65ac8e860ddba67db7d2dca42fed955c6db10a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:42 +0200
Subject: [PATCH 633/825] kpimtextedit: update to 21.08.0.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 710de4475b5c2ced45bdad7dc071ca6c976d8196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:43 +0200
Subject: [PATCH 634/825] kidentitymanagement: update to 21.08.0.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 5a0fefdf0ba944aa7373117aeb6a1c029469279b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:45 +0200
Subject: [PATCH 635/825] akonadi5: update to 21.08.0.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 354ada6ff88605a0fa106f6ebeb5a159939670ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:04:46 +0200
Subject: [PATCH 636/825] pim-data-exporter: update to 21.08.0.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d

From 3a101032252415b8789301dc62dd3a5e31d5f19d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:06 +0200
Subject: [PATCH 637/825] dolphin-plugins: update to 21.08.0.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4

From 591550f8e53b644e3924701db22636268ed433b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:05:12 +0200
Subject: [PATCH 638/825] mailimporter: update to 21.08.0.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 900ab560fdabf75643ff6b6b816ae7b995e775ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 13 Aug 2021 16:52:44 +0200
Subject: [PATCH 639/825] khelpcenter: update to 21.08.0.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 18ffdbb0bb25777fc2cc2915c6d29908648a1246 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:56 +0200
Subject: [PATCH 640/825] ark: update to 21.08.0.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build

From c301c6d3b4adc1da88b3fa3c3e39843bb3276383 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:52:58 +0200
Subject: [PATCH 641/825] elisa: update to 21.08.0.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1fb56de03284c99da04ecef211de3bf1c0fcb63b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:00 +0200
Subject: [PATCH 642/825] kdeconnect: update to 21.08.0.

---
 srcpkgs/kdeconnect/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3

From f8139ae47746efff68c06859067c3a15ecefc208 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:01 +0200
Subject: [PATCH 643/825] kdegraphics-thumbnailers: update to 21.08.0.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab

From 01e4e04c9db391b521c1e19645f19acfdd654d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:03 +0200
Subject: [PATCH 644/825] knights: update to 21.08.0.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3

From daecacf95faca11c2fa226840d9262d176f78c69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 14:53:04 +0200
Subject: [PATCH 645/825] kqtquickcharts: update to 21.08.0.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d9ac04925c82400ef2b88d59684a7eae87d324b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:41 +0200
Subject: [PATCH 646/825] gespeaker: remove package

doesn't work with espeak-ng
---
 srcpkgs/gespeaker/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/gespeaker/template

diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15

From ae7d3175bc19a6bd23e61dc3520a54989e2a2721 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 23:03:54 +0200
Subject: [PATCH 647/825] removed-packages: add gespeaker

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3b1dbd467489..292ffc7ea954 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -69,6 +69,7 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1

From ebed12cd4a5c3f6ffbdca8486af5ed443f719b29 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sat, 14 Aug 2021 01:26:36 +0300
Subject: [PATCH 648/825] bmake: update to 20210808.

---
 srcpkgs/bmake/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ef3463e7e554..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210803
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=a7127d581661038219e21531486f4779b333eb5395e5c8fc2426b20badd24c87
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {

From 02dd3d09f1d29734bdcc2c0946705d08f95c1dd0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 14 Aug 2021 11:46:36 +0200
Subject: [PATCH 649/825] ardour: update to 6.9.

---
 srcpkgs/ardour/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"

From 178bdd212e3ef94478d24c04695099bfb4846a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:27:14 +0200
Subject: [PATCH 650/825] doomretro: update to 4.2.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251

From 14c3ed95f9008695845252af7068464c01fb6be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 15 Aug 2021 10:36:47 +0200
Subject: [PATCH 651/825] exiftool: update to 12.30.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f

From 819e759ab49df8fa6c114633f8ba8f43d8357627 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sun, 15 Aug 2021 17:51:22 +0700
Subject: [PATCH 652/825] kamoso: update to 21.08.0

---
 srcpkgs/kamoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602

From f2e0b10d1174742bcc866d5c0fecb2e3cb4cac42 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Sun, 15 Aug 2021 19:23:52 +0300
Subject: [PATCH 653/825] evilwm: update to 1.3.1.

---
 srcpkgs/evilwm/files/evilwm.desktop | 11 -----------
 srcpkgs/evilwm/template             | 17 +++++++++--------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop

diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }

From 9a3759752e37d746fe81db23b9a0fdae3ad0826c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:20:00 +0200
Subject: [PATCH 654/825] zathura-pdf-mupdf: update to 0.3.7

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..256a5d51f883 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
-revision=2
+version=0.3.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
@@ -12,7 +12,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
 LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"

From 8b924b59393fc0bb4f1da6e456aa601c51189d16 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 15 Aug 2021 18:21:42 +0200
Subject: [PATCH 655/825] zathura-ps: update to 0.2.7

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE

From 0fd004294a119c140fd53f831e92bae8f96c5576 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 13 Aug 2021 08:50:01 +0200
Subject: [PATCH 656/825] xmobar: update to 0.39

---
 srcpkgs/xmobar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"

From 87afe34b69f6a143b4d1816e27955bf45d12f65b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 12 Aug 2021 16:58:56 +0300
Subject: [PATCH 657/825] libjpeg-turbo: update to 2.1.1.

---
 srcpkgs/libjpeg-turbo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From a9731c17e327e6c2ad700673ce35e7176cfcb57c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 658/825] x265: update to 3.5.

---
 common/shlibs         |  2 +-
 srcpkgs/x265/template | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 301649ded872..42fd333f33b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi

From 4e9f6f105f2c31e89333cbadd0fe0c465e2876ad Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 659/825] ffmpeg: revbump for x265

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 792fb7290d4871457cd84725f0c1e98f14d4d8b8 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 660/825] vlc: revbump for x265

also add ci-skip due to fail on test/run_vlc.sh
---
 srcpkgs/vlc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"

From e05d74ad6dcfd7ed337adcf7ad80334b765ccd09 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 661/825] libheif: revbump for x265

---
 srcpkgs/libheif/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"

From b081e58bbe8e7f5ad79ec6a6154d0c440309bdf4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 662/825] handbrake: revbump for x265

---
 srcpkgs/handbrake/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden

From 9d7463b59ba7f71296dd3d323cbc0c113763b865 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 663/825] gst-plugins-bad1: revbump for x265

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From 6c9e2ac11a83bc2955181e9969bb50a0df33d190 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 664/825] avidemux: revbump for x265

---
 srcpkgs/avidemux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"

From 3a51724b41f507370e1287dacc5f8ca262b263d2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 17:20:59 -0400
Subject: [PATCH 665/825] spotify-qt: update to 3.7.

---
 .../spotify-qt/patches/disable-crash-handler.patch | 14 ++++++++++++++
 srcpkgs/spotify-qt/template                        |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch

diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8

From eef9c0c820a80154b0e84fe6dc1c966a3a6e144b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 15 Aug 2021 23:56:48 +0200
Subject: [PATCH 666/825] lagrange: update to 1.6.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 15992e57dbaa..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.2
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=b67b0c0e95c221f5afcd0f4d81c1130401adbbdfc802761bbf012e478b720767
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md

From 867c04369c5ee4324d553d47ce06bec4b91e2f84 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:43 +0400
Subject: [PATCH 667/825] fmt: update to 8.0.1.

---
 common/shlibs        | 2 +-
 srcpkgs/fmt/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42fd333f33b9..d24c2bacbc9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE

From 019a84a94e9d592e31f3919275dd45f1c4cd371f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 668/825] spdlog: update to 1.9.1.

---
 srcpkgs/spdlog/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"

From 6a646d75fe9ac6531c6b5bbe6185010c9e5f828a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 669/825] cherrytree: rebuild against libfmt.so.8

---
 srcpkgs/cherrytree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 8789cd37dba7..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=0.99.39
-revision=1
+revision=2
 wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"

From e8d16a2335617d3ca804e3702322dd3fe29716c6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 670/825] Waybar: rebuild for libfmt.so.8.

---
 .../patches/libfmt8-compatibility.patch       | 40 +++++++++++++++++++
 srcpkgs/Waybar/template                       |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch

diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}

From 06928a0fc668aba2d235d0e17325708ee29d604e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 671/825] gerbera: rebuild against libfmt.so.8

---
 srcpkgs/gerbera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"

From 55445ac53e9b4ed1d91d313ac6847915dce83da4 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 672/825] kodi: fold kodi-rpi into it, rebuild for libfmt.so.8

We don't want to maintain kodi 18.x into eternity (which would start
with patching it correctly for libfmt.so.8), and, as explained in
9f8647640b3ce3e4a99f0ba7022eb6d55ba77c97, current kodi can't be built
for rpi specifically anymore. We will assume normal kodi is enough.
---
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 ---
 .../patches/add-missing-includes.patch        |  10 --
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 ------
 .../disable-static-texturepacker-build.patch  |  11 --
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 -----------
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 --
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 --
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 ---
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 ------
 srcpkgs/kodi-rpi/template                     | 119 ------------------
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 ++
 srcpkgs/kodi/template                         |   8 +-
 17 files changed, 15 insertions(+), 364 deletions(-)
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}

From 94af74f98abffb0dc18c7803d9a755330fe161fc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 673/825] mkvtoolnix: rebuild against libfmt.so.8

---
 srcpkgs/mkvtoolnix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0875991a872f..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=60.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt

From fe75f492fb5d4344d3223ad6873624e3fc436543 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 674/825] nheko: rebuild against libfmt.so.8

---
 srcpkgs/nheko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel

From ff0dfc66165192471af70cb8640049b3099ea5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 8 Aug 2021 18:38:31 -0300
Subject: [PATCH 675/825] cryfs: rebuild against libfmt.so.8

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d8f855a80af..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=3
+revision=4
 create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off

From 1b91642c8c52a1904f911be63a7ea898e74762f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 18:31:05 -0300
Subject: [PATCH 676/825] 0ad: rebuild against libfmt.so.8

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 2e095d293a6a..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.25
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 0d66ebda9af3e5d6f0bc78d8b2f6d34cb22c8a52 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 15 Aug 2021 20:22:27 -0400
Subject: [PATCH 677/825] zathura-pdf-mupdf: depends on gumbo now

---
 srcpkgs/zathura-pdf-mupdf/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 256a5d51f883..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,11 +1,12 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
 version=0.3.7
-revision=1
+revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -15,8 +16,6 @@ distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.t
 checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }

From a3833c178ef0ae3fe99aa21e647928d533970260 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:13:43 +0200
Subject: [PATCH 678/825] gucci: update to 1.5.0.

---
 srcpkgs/gucci/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..58cdb9f09567 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
 
 post_install() {
 	vlicense LICENSE

From 6146d97a1abd17233b9ad813ef5a69162fe5246e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:14:43 +0200
Subject: [PATCH 679/825] python3-pyinfra: update to 1.4.12.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index b7c5bebb3e56..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.11
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=809c54e78e89517a9736ab1f82f896c881f8d050a4aec366fc4962198b224bda
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 0ac449e9d9ff17d5c1401deeeefb9a960458ec66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 12:17:01 +0200
Subject: [PATCH 680/825] openbsd-netcat: update to 1.217.1.

---
 srcpkgs/openbsd-netcat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc

From b20e341847734fcd18d55b45e3499a2f2caed0ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 Aug 2021 13:10:03 +0200
Subject: [PATCH 681/825] gucci: fix checksum.

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 58cdb9f09567..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=a59c2ce87e17ef46d9c89b126f959633a053110b7a16a84f65e7750f3e0ac396
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE

From d82e0b4f3787f56dbe28f0bf4ae90bdf68d6519c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:52:54 +0300
Subject: [PATCH 682/825] New package: libdecor-0.1.0_1

---
 common/shlibs             |  1 +
 srcpkgs/libdecor-devel    |  1 +
 srcpkgs/libdecor/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template

diff --git a/common/shlibs b/common/shlibs
index d24c2bacbc9e..befa6484dfee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,4 @@ liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From bbcbbeaec95ea31fcb759fadcf9a474be13190b0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:53:28 +0300
Subject: [PATCH 683/825] SDL2: update to 2.0.16.

---
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch | 32 +++++++++++++++++++
 srcpkgs/SDL2/template                         | 24 +++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch

diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi

From e8a936defab94d59c64ebcf0a1ad8e33dc4abbdf Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Fri, 13 Aug 2021 13:48:11 +0200
Subject: [PATCH 684/825] pandoc: update to 2.14.0.3

---
 srcpkgs/pandoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes

From 2e5f7e7179a68671dd08480535e3b6d06be7af9e Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 16 Aug 2021 17:47:30 +0100
Subject: [PATCH 685/825] font-iosevka: update to 10.0.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 1388c2af3ccd..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=9.0.1
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
-df3a4b213241d76868a559be72a7a1828892503bb2fa21453584439dae77d620
-be88b5bc4ff6484817df71b1f6bc87adf56d9c050dfa1b75c9014d1e791b7b5d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 315555c5ace34fb7a8f06c7bdc3059ada89baab7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:38 +0200
Subject: [PATCH 686/825] attica: update to 5.85.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build

From 297a51d7e6760c1b4f924366b3f8935894c129bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:39 +0200
Subject: [PATCH 687/825] baloo5: update to 5.85.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build

From eaad4ed9eaa001ac52e9dd19ca6327b88a1c1306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:40 +0200
Subject: [PATCH 688/825] bluez-qt5: update to 5.85.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build

From 4ffbb41c2271a1b72d19bbabed45db58654b5d42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:42 +0200
Subject: [PATCH 689/825] breeze-icons: update to 5.85.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 9bb4588b16b6c53e2b6fb9339c6379899275d56c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:43 +0200
Subject: [PATCH 690/825] extra-cmake-modules: update to 5.85.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {

From 90378019b590c05c84e9198972eac9fc66d2ab18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:45 +0200
Subject: [PATCH 691/825] frameworkintegration: update to 5.85.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From f93152fbcf2e8ec8fdcf9f70bb937a7979481c20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:46 +0200
Subject: [PATCH 692/825] kactivities5-stats: update to 5.85.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c6e0a35f1eb4c4b430f43dfc729b476f442b0cbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:48 +0200
Subject: [PATCH 693/825] kactivities5: update to 5.85.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 0caf0735441330851821931f791b398307087954 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:49 +0200
Subject: [PATCH 694/825] kapidox: update to 5.85.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 2654859f4f9d8fb5e97f337a096319834a3abf93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:51 +0200
Subject: [PATCH 695/825] karchive: update to 5.85.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2481e284dae555bbbac6fe5cb82aeeaad3915326 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:52 +0200
Subject: [PATCH 696/825] kauth: update to 5.85.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build

From 78c8468ccc6bfedd0e21fe1dafefcadf4dbd5a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:53 +0200
Subject: [PATCH 697/825] kbookmarks: update to 5.85.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 7bbcdcca1090e9690fa314c95086f7b3a5995622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:55 +0200
Subject: [PATCH 698/825] kcalendarcore: update to 5.85.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {

From 2500fd5c0eb8abd9bb397fd45147d65333caac3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:56 +0200
Subject: [PATCH 699/825] kcmutils: update to 5.85.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 97660c36441c383de50fded0e95315059c2d0cba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:58 +0200
Subject: [PATCH 700/825] kcodecs: update to 5.85.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From b2431451836546c2681f63bf3652fdf1df44832d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:56:59 +0200
Subject: [PATCH 701/825] kcompletion: update to 5.85.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From ef4aa708ad06563e44ed1250e44c6d5b7e16c8f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:00 +0200
Subject: [PATCH 702/825] kconfig: update to 5.85.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build

From 030dd65a558eaf906866e59e9088536d110439df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:02 +0200
Subject: [PATCH 703/825] kconfigwidgets: update to 5.85.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 115a9ee52b940fd666702755ab507229e7f88ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:03 +0200
Subject: [PATCH 704/825] kcontacts: update to 5.85.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 16e8a71ffae10485ca2408d2d7b2188740e2e4f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:05 +0200
Subject: [PATCH 705/825] kcoreaddons: update to 5.85.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8ad48d7ce9efca6c8d955eb404f6289e6634a248 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:06 +0200
Subject: [PATCH 706/825] kcrash: update to 5.85.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 5b09310a680fad7daecb6cd6f5ff5baef7073194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:07 +0200
Subject: [PATCH 707/825] kdav: update to 5.85.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2e1a4b123118a28a51842356ba65f22ffecbb908 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:09 +0200
Subject: [PATCH 708/825] kdbusaddons: update to 5.85.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build

From a6063edcb015d98a9516b6459a93dd7e39725fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:10 +0200
Subject: [PATCH 709/825] kdeclarative: update to 5.85.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build

From b58463cebde137bbaf344593b4dac236d82ea73b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:11 +0200
Subject: [PATCH 710/825] kded: update to 5.85.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 813e5d50e9ab6098d809790c647fef291d1bbcfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:13 +0200
Subject: [PATCH 711/825] kdelibs4support: update to 5.85.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From f26ab38313ff931308950d33a2157f473aa65775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:15 +0200
Subject: [PATCH 712/825] kdesignerplugin: update to 5.85.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 074064cab85ad195ed54fad3365110bb65697fb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:16 +0200
Subject: [PATCH 713/825] kdesu: update to 5.85.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 6723eb7a14f95df08e70c668b952b5293eac4f14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:17 +0200
Subject: [PATCH 714/825] kdewebkit: update to 5.85.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 8dedc37cca62f7ca300900015350fd93a47130c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:19 +0200
Subject: [PATCH 715/825] kdnssd: update to 5.85.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 96804847213c4cdc475d68386eb9f3d56374640b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:20 +0200
Subject: [PATCH 716/825] kdoctools: update to 5.85.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From d89f2ab2b0d207eb6c810ee744ac26c6162c250b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:22 +0200
Subject: [PATCH 717/825] kemoticons: update to 5.85.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c95c937028c6d7f3d3bab11797a647cb6ced7e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:23 +0200
Subject: [PATCH 718/825] kfilemetadata5: update to 5.85.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 091aeb80416fbdc2d1b1e80f06aed9f0f89c63c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:25 +0200
Subject: [PATCH 719/825] kglobalaccel: update to 5.85.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From aafcd6bc146b679535e106d5c5bb1019c11462e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:26 +0200
Subject: [PATCH 720/825] kguiaddons: update to 5.85.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 20fa2641f624e1ab60de830874a0c74d7d3571d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:27 +0200
Subject: [PATCH 721/825] kholidays: update to 5.85.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 7b73c43f3b4b56bbc28354f7e4188d7e0f1204ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:29 +0200
Subject: [PATCH 722/825] khtml: update to 5.85.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 384d745162219a27ff6e001ea053a0897d4786f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:31 +0200
Subject: [PATCH 723/825] ki18n: update to 5.85.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 27c2a331f8d6a3f30913a40ea5143374521a9b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:32 +0200
Subject: [PATCH 724/825] kiconthemes: update to 5.85.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 2f4e82c1a70b0aabb5ba6d0474c9f6e4498118dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:33 +0200
Subject: [PATCH 725/825] kidletime: update to 5.85.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 39482710f0967436af2ed135eca26d0da46843c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:35 +0200
Subject: [PATCH 726/825] kimageformats: update to 5.85.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799

From a123ee2023f204bcf2ba4ad1f316127607d3e63d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:36 +0200
Subject: [PATCH 727/825] kinit: update to 5.85.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"

From efd50809ce5066ae67f4ba5a340a745271230bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:38 +0200
Subject: [PATCH 728/825] kio: update to 5.85.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build

From a0300ad364943a3e77c8e96161763eca2ff446ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:39 +0200
Subject: [PATCH 729/825] kirigami2: update to 5.85.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 6322622b6a74dd5cf88a9fda7341d9e284124826 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:41 +0200
Subject: [PATCH 730/825] kitemmodels: update to 5.85.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From a5221ce5675ca10bebafebffb7092ab10de05028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:42 +0200
Subject: [PATCH 731/825] kitemviews: update to 5.85.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From d8246fff44a617073bf2ab61f80a47aa4d8265cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:43 +0200
Subject: [PATCH 732/825] kjobwidgets: update to 5.85.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 30f55c806e4da935760e6a9d943691e183a4f270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:45 +0200
Subject: [PATCH 733/825] kjs: update to 5.85.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0663e68594a81f244916681ae8ed76c9d1f80723 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:46 +0200
Subject: [PATCH 734/825] kjsembed: update to 5.85.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 4ad01687182714a8f34045e93b8ea522138e538e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:47 +0200
Subject: [PATCH 735/825] kmediaplayer: update to 5.85.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 37569ee6b90c3438a5b8c1288e9f58e6da4e77ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:49 +0200
Subject: [PATCH 736/825] knewstuff: update to 5.85.0.

---
 srcpkgs/knewstuff/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 156fa1a0102b..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,7 +1,7 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
-revision=2
+version=5.85.0
+revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 6c40532fd219842003359715b5e85ac2d820ac7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:50 +0200
Subject: [PATCH 737/825] knotifications: update to 5.85.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 10f686745a94f133589ba0b6fd39baa5a425449d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:52 +0200
Subject: [PATCH 738/825] knotifyconfig: update to 5.85.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 11f08dcda0bd53767f4429f20f565874fbb40491 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:53 +0200
Subject: [PATCH 739/825] kpackage: update to 5.85.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 83081a01acf88dcce7ceab0227e74e621dac39bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:54 +0200
Subject: [PATCH 740/825] kparts: update to 5.85.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!

From 16c4f342f6ce383a9a90345908ad7fe2a3602022 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:56 +0200
Subject: [PATCH 741/825] kpeople: update to 5.85.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build

From 9db8d17397c905944b2152a52689a1327df127c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:57 +0200
Subject: [PATCH 742/825] kplotting: update to 5.85.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e2835761669d71ef968242d49d53531d9ca665e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:57:58 +0200
Subject: [PATCH 743/825] kpty: update to 5.85.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 83ad5b256a11ce26d15b93a13da782fe8ca7f137 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:00 +0200
Subject: [PATCH 744/825] kquickcharts: update to 5.85.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build

From a8f17ad4b7c529da8a75a53378872a2867cb5a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:01 +0200
Subject: [PATCH 745/825] kross: update to 5.85.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From db90af54f37dc4434da4b35f3b9b308ac372206e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:02 +0200
Subject: [PATCH 746/825] krunner: update to 5.85.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build

From 17735616321966ba538f764c9f9e965d79e36e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:03 +0200
Subject: [PATCH 747/825] kservice: update to 5.85.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 30857293f5527afe39f9490d3171497746d7f7e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:05 +0200
Subject: [PATCH 748/825] ksolid: update to 5.85.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 50e1d866b0962a19cae13349f7d13b72219709ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:07 +0200
Subject: [PATCH 749/825] ktexteditor: update to 5.85.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build

From 8e825ae021e09753b5ac54f1dbd7b963fec6708d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:08 +0200
Subject: [PATCH 750/825] ktextwidgets: update to 5.85.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 50429eef0037466f1ad806a85b05669ac389bccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:10 +0200
Subject: [PATCH 751/825] kunitconversion: update to 5.85.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 11494033e7820539ef168e0be9e8b42cf4ac6439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:11 +0200
Subject: [PATCH 752/825] kwallet: update to 5.85.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 96d851e1d3a418e69a482db8b56b3620b7d25332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:13 +0200
Subject: [PATCH 753/825] kwayland: update to 5.85.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5b8613a8535c44de54097b494132890759f480e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:14 +0200
Subject: [PATCH 754/825] kwidgetsaddons: update to 5.85.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build

From 76f168943e19230ffd6d40404fbe1b9011d7af7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:16 +0200
Subject: [PATCH 755/825] kwindowsystem: update to 5.85.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 011a64dc3e104ca6c147934fc6adc82d9dc616fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:17 +0200
Subject: [PATCH 756/825] kxmlgui: update to 5.85.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build

From 74c6b7f14952dddcd702685aa22619d9c15ac26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:18 +0200
Subject: [PATCH 757/825] kxmlrpcclient: update to 5.85.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From d311e117910bfe9faf5416a41d7b9314bfbad1ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:20 +0200
Subject: [PATCH 758/825] modemmanager-qt5: update to 5.85.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build

From 5fa89a37b3e714cecc3edd432e530bff81bd4fd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:22 +0200
Subject: [PATCH 759/825] networkmanager-qt5: update to 5.85.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build

From 8279cae0cc1f3ed628ba50af7ea840a57cae35b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:56 +0200
Subject: [PATCH 760/825] oxygen-icons5: update to 5.85.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 98053b36a5d72f02b663a4aaa423ffd2d4a299b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:58 +0200
Subject: [PATCH 761/825] plasma-framework: update to 5.85.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build

From c915834b2b43b7546f9ac3e84d45211611eb3844 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:58:59 +0200
Subject: [PATCH 762/825] prison: update to 5.85.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 668d46804d7a68c752b25f92d5188ceec986a951 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:01 +0200
Subject: [PATCH 763/825] purpose: update to 5.85.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build

From c64ea90cfb70af59986f09c4d2c3a1ecaf97cca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:02 +0200
Subject: [PATCH 764/825] qqc2-desktop-style: update to 5.85.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e5ed77074972bf1556556b829ed68a5b1d4dd1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:03 +0200
Subject: [PATCH 765/825] sonnet: update to 5.85.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From d630a834a6a19ece25d163a6fec0b0cb679beea4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:05 +0200
Subject: [PATCH 766/825] syndication: update to 5.85.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"

From edd8544fc278b46be1d94ad52fba6557b772f101 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:07 +0200
Subject: [PATCH 767/825] syntax-highlighting: update to 5.85.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 52f74120e733b02efc21a04d2f89d35582c7f0f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 Aug 2021 15:59:08 +0200
Subject: [PATCH 768/825] threadweaver: update to 5.85.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 06d6876c9d45bae74a2b6e68143cf3d8c5b7dfd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:38:43 +0200
Subject: [PATCH 769/825] libspa-ffmpeg: remove package

this plugin is useless right now, so removing it to break a cycle
SDL2 -> pipewire -> ffmpeg -> SDL2
---
 srcpkgs/libspa-ffmpeg     |  1 -
 srcpkgs/pipewire/template | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libspa-ffmpeg

diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {

From f96e390b5b527a5c3b7fb6b18fa41d396a84bf32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 00:39:04 +0200
Subject: [PATCH 770/825] removed-packages: add libspa-ffmpeg and revbump

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 292ffc7ea954..2bba802eef79 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=48
+revision=49
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -324,6 +324,7 @@ replaces="
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
  nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From b2c141998e8bb89f0f9e291881e1df3f8acc9d7f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 15 Aug 2021 18:47:02 +0300
Subject: [PATCH 771/825] wob: update to 0.12.

---
 srcpkgs/wob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE

From ff7b407a82718d434950e44708f35404ec74ac75 Mon Sep 17 00:00:00 2001
From: Vo Kar <vokar97@pm.me>
Date: Tue, 17 Aug 2021 13:27:35 +0300
Subject: [PATCH 772/825] i3status-rust: update to 0.20.3.

---
 srcpkgs/i3status-rust/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 30d649d891b4e6930f0fdccb737c524690ab56f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:10 +0700
Subject: [PATCH 773/825] perl-CGI: depends on perl-HTML-Parser

Even Debian has this mandatory dependencies
---
 srcpkgs/perl-CGI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From bf88ea392c9a968169eaab53653736b86cf7033e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:11 +0700
Subject: [PATCH 774/825] git: update to 2.33.0.

---
 srcpkgs/git/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 26daa34f23b07cab2e206c6c2e8792fef2a721e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 18:41:13 +0700
Subject: [PATCH 775/825] chroot-git: update to 2.33.0.

---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..2bdb4d76bee0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,20 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	checkdepends="perl gnupg"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
@@ -28,7 +27,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +37,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -52,6 +53,10 @@ do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }

From 09c9a277314b7a9b0fa14dbd4c5489c4e1222f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 17 Aug 2021 21:28:05 +0700
Subject: [PATCH 776/825] chroot-git: use masterdir's zlib-devel in bootstrap

---
 srcpkgs/chroot-git/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 2bdb4d76bee0..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -14,8 +14,6 @@ checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -47,6 +45,9 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {

From c6e810ddb257dc6f23e81c00a935beb31bca7d49 Mon Sep 17 00:00:00 2001
From: auronandace <81362994+auronandace@users.noreply.github.com>
Date: Mon, 16 Aug 2021 18:54:22 +0100
Subject: [PATCH 777/825] alacritty: update to 0.9.0

---
 srcpkgs/alacritty/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 1493be14f28c79e90fb222e0206b38dc0eb4540c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 15:46:15 +0200
Subject: [PATCH 778/825] perl-IO-Socket-SSL: update to 2.072.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d

From f72397c8c87688f45f27333190ba881c8cd68465 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 17 Aug 2021 19:15:01 +0200
Subject: [PATCH 779/825] libx86: fix illegal instruction in LRMI_init.

E.g. triggered by read-edid.
Change upstream to debian source.
Adopt.
---
 srcpkgs/libx86/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}

From 8467dd905d2f784b4de7259c608a8c2375b7d996 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:40:27 +0200
Subject: [PATCH 780/825] linux5.4: update to 5.4.141.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9316ea45e0a8..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.140
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=2c657a2df4f2e805ac50aeb39ecf5d1e4cb1501e7fcf15eafd14486b587f7e43
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From cc351820d2fc87850d622e155cfbacf5e2103c35 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:37:02 +0700
Subject: [PATCH 781/825] ktuberling: update to 21.08.0

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297

From d96db658c08314db71d39604eeb8515b639e67a9 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 17 Aug 2021 22:32:46 +0700
Subject: [PATCH 782/825] krfb: update to 21.08.0

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592

From 861a06b86d5f3389a778dd8760c377ea7cf45447 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 19:42:19 +0200
Subject: [PATCH 783/825] linux4.19: update to 4.19.204.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 914f8f45b75f..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.203
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=ffb04250ae51809d71535650d71f5a3718d774b337d7874ff74a845fbd846afa
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From e3acb7dab578180bda9cdd6b8a2ce891faaf73fa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 17 Aug 2021 20:00:21 +0200
Subject: [PATCH 784/825] smplayer: update to 21.8.0.

---
 srcpkgs/smplayer/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {

From 85788cebabfb520064ffd2bb5ef894e796cdaed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 17:56:19 +0200
Subject: [PATCH 785/825] xbps-src: source msg_warn before its first use

---
 xbps-src | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..5e75926c5ad5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -689,12 +689,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +696,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 106b97096f88a0d97e9528d55e6bd510c86126c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 18:58:39 +0200
Subject: [PATCH 786/825] xbps-src: limit warning on file:/// mirror to related
 targets

---
 xbps-src | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 5e75926c5ad5..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }

From 6fad3941d4d46322eeaabd6d1d02bc1002fcbc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:30 +0200
Subject: [PATCH 787/825] diffoscope: update to 180.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e

From 52c52d339096431b3f82c03f6a2ce00c0837b4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:31 +0200
Subject: [PATCH 788/825] hunspell-pl_PL: update to 20210731.

---
 srcpkgs/hunspell-pl_PL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip

From 8942d2f87099d27784a09b841e2957a8d9ada190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:32 +0200
Subject: [PATCH 789/825] python3-libarchive-c: update to 3.1.

---
 srcpkgs/python3-libarchive-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103

From f191db1d9cdfde83d6dba481c9726d7a995ab016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:33 +0200
Subject: [PATCH 790/825] python3-pysol_cards: update to 0.10.2.

---
 srcpkgs/python3-pysol_cards/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE

From e6a84dc43c3e193f3646bce3000ae8c41ba39a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:30:34 +0200
Subject: [PATCH 791/825] tox: update to 3.24.1.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 2b65cf79d475eaf53a3bc75d4f8fe1bce7f3d028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 17 Aug 2021 20:50:44 +0200
Subject: [PATCH 792/825] konversation: update to 21.08.0.

---
 srcpkgs/konversation/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi

From 88b2e95d7619d7296352a71bb026f3ff934b9246 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:00:52 +0700
Subject: [PATCH 793/825] gnome-desktop: update to 40.3

---
 srcpkgs/gnome-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"

From 7a6acd873d5d2c27dc975ceac5196d075386f778 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 02:34:23 +0700
Subject: [PATCH 794/825] gnome-shell: update to 40.3

---
 srcpkgs/gnome-shell/template | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }

From c638ca21e450284db0777605fa8c13faa1e7da57 Mon Sep 17 00:00:00 2001
From: thegarlynch <yenaskithegar@gmail.com>
Date: Sat, 17 Jul 2021 03:39:28 +0700
Subject: [PATCH 795/825] gnome-shell-extensions: update to 40.3

---
 srcpkgs/gnome-shell-extensions/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b

From 0ab4c8bdad466fa14db4a2676c35639e3ce77799 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:18:12 +0200
Subject: [PATCH 796/825] gnome-shell-mousewheel-zoom: remove package

* inactive
* doesn't work with current GNOME
---
 srcpkgs/gnome-shell-mousewheel-zoom/template | 23 --------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template

diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}

From 4d4179442f372b361655bbb9749c5426b03cd987 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 17 Aug 2021 22:19:25 +0200
Subject: [PATCH 797/825] removed-packages: add gnome-shell-mousewheel-zoom

---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2bba802eef79..3565931e6fa4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -74,6 +74,7 @@ replaces="
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6

From 92bb9bd99f9d46d5819230044574c55708adf036 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:51:05 +0200
Subject: [PATCH 798/825] img2pdf: disable tests

tests need ImageMagick6
---
 srcpkgs/img2pdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6

From 41e875032cdb3707596cb8b965b89f493dc96356 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:52:41 +0200
Subject: [PATCH 799/825] ImageMagick6: remove package

---
 srcpkgs/ImageMagick6/template | 86 -----------------------------------
 srcpkgs/ImageMagick6/update   |  1 -
 srcpkgs/libmagick6            |  1 -
 srcpkgs/libmagick6-devel      |  1 -
 srcpkgs/libmagick6-perl       |  1 -
 5 files changed, 90 deletions(-)
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 213d98a37659..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file

From cf2db54eaec8ad87e17d354bc3b6332995155ac8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 14 Aug 2021 22:53:22 +0200
Subject: [PATCH 800/825] removed-packages: add ImageMagick6 and revbump

---
 srcpkgs/removed-packages/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3565931e6fa4..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=49
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -182,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11

From 34076e87e24b954c87ed64f392692b096b0568f0 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 17 Aug 2021 19:05:44 -0400
Subject: [PATCH 801/825] ejabberd: update to 21.07.

---
 srcpkgs/ejabberd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"

From 713f647d89fa4d0ff9e2cff95853c59c5a44d2a6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:04:01 -0400
Subject: [PATCH 802/825] mongo-c-driver: update to 1.19.0.

---
 srcpkgs/mongo-c-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From d7c095db6829659864e770dbc4710f388ecc32ac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:10:49 -0400
Subject: [PATCH 803/825] pcsclite: update to 1.9.3.

---
 srcpkgs/pcsclite/patches/python3.patch | 12 +++---------
 srcpkgs/pcsclite/template              |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd

From dc2b89ab40fb0654975fe16c1bc4d80d3d3f70e5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:17:43 -0400
Subject: [PATCH 804/825] oidentd: update to 3.0.0.

---
 srcpkgs/oidentd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd

From c0d765f99dafcece0ac674f5fba702b61ebe8c00 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:19:02 -0400
Subject: [PATCH 805/825] sqlmap: update to 1.5.8.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {

From da71c8b8f4c3922c14294fa177680cffa6ccee50 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:30:25 -0400
Subject: [PATCH 806/825] libnsl: update to 2.0.0.

---
 common/shlibs           | 2 +-
 srcpkgs/libnsl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index befa6484dfee..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3658,7 +3658,7 @@ libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
 libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi

From 9b2bb5ae2c2f1f6bc05918d726b2897685456149 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 17 Aug 2021 20:25:57 -0400
Subject: [PATCH 807/825] log4cpp: bump for libnsl

---
 srcpkgs/log4cpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"

From 8ad2ca7965e1135e103d4a258fb7197f3da8e244 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Tue, 17 Aug 2021 10:18:54 -0500
Subject: [PATCH 808/825] kitty: update to 0.23.1.

Closes: #32541 [via git-merge-pr]
---
 srcpkgs/kitty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From eeb785239f5601a4340099f9cccc617bce96656c Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:48:09 +0200
Subject: [PATCH 809/825] fuzzel: update to 1.6.2.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 76d7618695262cc23d9ba8fcaa8431608b2867bb Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 17 Aug 2021 13:50:37 +0200
Subject: [PATCH 810/825] fcft: update to 2.4.5.

---
 srcpkgs/fcft/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 678d3823497b8d015d91254beefd45ba6db20494 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH 811/825] dbeaver: update to 21.1.5.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.4
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {

From 7c4b90200da0639a4923cab9033ff9b056a0c5ae Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 13 Aug 2021 13:38:02 -0500
Subject: [PATCH 812/825] mesa: update to 21.1.7.

---
 srcpkgs/mesa/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 68d6a112681e..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.6
-revision=2
-wrksrc="mesa-${version}"
+version=21.1.7
+revision=1
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From f9fa2f9c9a8d8e3e1a9894bf79d3eccc18d39ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 17 Aug 2021 16:56:25 -0300
Subject: [PATCH 813/825] haproxy: update to 2.4.3.

Move to using DEBUG_CFLAGS when passing CFLAGS to makefile, otherwise we
override their required CFLAGS, such as -fwrapv.
---
 srcpkgs/haproxy/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index c155186f100d..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
-revision=2
+version=2.4.3
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"

From 31232ddded030da3d9b826b549f69f93805e057a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:54:42 -0400
Subject: [PATCH 814/825] grpc: update to 1.39.1.

---
 srcpkgs/grpc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then

From cf20825bcef7ed44b0d43dd47ee4475fd06b060e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:55:19 -0400
Subject: [PATCH 815/825] python3-Pygments: update to 2.10.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From d1dbca1781b1d37869ca22f711964c8df4089027 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 20:56:50 -0400
Subject: [PATCH 816/825] python3-numpy: update to 1.21.2.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From b233ae640477ca07746b4a2da1e7199f1705bd04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 21:11:07 -0400
Subject: [PATCH 817/825] python3-pandas: update to 1.3.2.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 2bb0ec3cadba28ebb1db5e8ca2ebb689614afa62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:07:59 -0400
Subject: [PATCH 818/825] python3-pip: update to 21.2.4.

---
 .../python3-pip/patches/no-versioned-pip.patch | 18 +++++++++---------
 srcpkgs/python3-pip/template                   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index b07a3022fe14..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,12 +1,12 @@
 --- a/setup.py
 +++ b/setup.py
 @@ -67,9 +67,7 @@
-     },
-     entry_points={
-         "console_scripts": [
--            "pip=pip._internal.cli.main:main",
-             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
-         ],
-     },
-     zip_safe=False,
+     },
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 225ede1ccd09..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.3
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=91e66f2a2702e7d2dcc092ed8c5ebe923e69b9997ea28ba25823943bcd3bf820
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 

From 1fc7f2202ba57a1a1b052c8356f874c19cb158f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:24 -0400
Subject: [PATCH 819/825] python3-pytools: update to 2021.2.8.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE

From 2d075e8ae6b138c55dd95ff467b8bc3382b3a6f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:09:43 -0400
Subject: [PATCH 820/825] python3-ultrajson: update to 4.1.0.

---
 srcpkgs/python3-ultrajson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt

From 42eb9816c485382bb5ecb04400c0005ee185d80d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:25 -0400
Subject: [PATCH 821/825] qtutilities: update to 6.5.0.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 7fbe9e1b321b450374390d2fa41c708ee83c6007 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:12:39 -0400
Subject: [PATCH 822/825] tagparser: update to 10.1.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From a7db6e87006afbff2101e6be212d518a1fe59ebd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Aug 2021 22:13:20 -0400
Subject: [PATCH 823/825] tageditor: update to 3.4.3.

libcgroup update version 2.o

checksum bz2 corrected

Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.

update to 2.0
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 .../libcgroup/patches/CVE-2018-14348.patch    |  12 +
 .../patches/api.c-fix-infinite-loop.patch     |  38 +
 srcpkgs/libcgroup/patches/musl-decls.patch    |   3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |   4 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 864 files changed, 4643 insertions(+), 5999 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..a1e7d86258cc 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,25 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
+<<<<<<< HEAD
 license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+=======
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+>>>>>>> 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +28,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index fbbbbe79bd3b..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.2
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 9d2e2588b4d7faa387fe16d81f8c80c412b38405 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 03:17:36 +0200
Subject: [PATCH 824/825] Revert "tageditor: update to 3.4.3."

This reverts commit a7db6e87006afbff2101e6be212d518a1fe59ebd.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 .../libcgroup/patches/CVE-2018-14348.patch    |  12 -
 .../patches/api.c-fix-infinite-loop.patch     |  38 -
 srcpkgs/libcgroup/patches/musl-decls.patch    |   3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |   4 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 864 files changed, 5999 insertions(+), 4643 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index a1e7d86258cc..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,25 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-<<<<<<< HEAD
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
-=======
-license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
->>>>>>> 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -28,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..fbbbbe79bd3b 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=43029df40c53122a6dd5b0c986bf53945bf492d30904d3d4d723b1936b0cbdd4
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From d5c64b71aa0df9c1d7bb8ec71da6ab4daca6a556 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 03:18:48 +0200
Subject: [PATCH 825/825] Revert "update to 2.0"

This reverts commit 54ca51742c6b3835d2a709a5770d356b7d8bd15c.
---
 srcpkgs/libcgroup/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..195e7b6f8194 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,13 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/libcgroup/libcgroup"
+<<<<<<< HEAD
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+=======
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+>>>>>>> parent of 54ca51742c (update to 2.0)
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1946300 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/7] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/7] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/7] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/7] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/7] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/7] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 54ca51742c6b3835d2a709a5770d356b7d8bd15c Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 02:50:48 +0200
Subject: [PATCH 7/7] update to 2.0

---
 srcpkgs/libcgroup/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..d52b837b1c2e 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,9 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-903032696

Comment:
@ericonr 

i usually do a : `git rebase -i HEAD~N` .

but i get all the other commits, because i am not in my own branch.
overreaching my pr.

is there another way i am not aware of?

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 2912262 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/8] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/8] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/8] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/8] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/8] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/8] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 54ca51742c6b3835d2a709a5770d356b7d8bd15c Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 02:50:48 +0200
Subject: [PATCH 7/8] update to 2.0

---
 srcpkgs/libcgroup/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..d52b837b1c2e 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,9 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

From 1ce84a22194c3f99d5f045b3af97624043e7ce0b Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 8/8] checksum bz2 corrected

Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  10 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 4581 insertions(+), 5996 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d52b837b1c2e..66cd710ab2d1 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,9 +1,10 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,6 +21,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1946300 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/7] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/7] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/7] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/7] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/7] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/7] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 54ca51742c6b3835d2a709a5770d356b7d8bd15c Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 02:50:48 +0200
Subject: [PATCH 7/7] update to 2.0

---
 srcpkgs/libcgroup/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..d52b837b1c2e 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,9 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-903032696

Comment:
@ericonr 

i usually do a : `git rebase -i HEAD~N` .

but i have accidentally interleaved other commits, which makes it impossible to squash

Re: [PR PATCH] [Updated] libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages master
https://github.com/void-linux/void-packages/pull/32231

libcgroup: update to 2.0.
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32231.patch --]
[-- Type: text/x-diff, Size: 1947061 bytes --]

From 3143a5ffb6695f73827220c9d48ed16993da34b8 Mon Sep 17 00:00:00 2001
From: cc <na@na.com>
Date: Wed, 28 Jul 2021 17:29:47 +0200
Subject: [PATCH 1/8] libcgroup: update to 2.0.

update libcgroup to version 2.0
---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-strerror_r.patch => musl-sterror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    | 14 +++----
 srcpkgs/libcgroup/update                      |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-strerror_r.patch => musl-sterror_r.patch} (99%)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..32a58fc7f677 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,6 +16,16 @@
+@@ -16,5 +16,15 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,5 +18,4 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
- 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-strerror_r.patch
rename to srcpkgs/libcgroup/patches/musl-sterror_r.patch
index 0f54e12b05d2..0f14d325e965 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-sterror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
- 
+
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
- 
+
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..0b8b45d0bce4 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
 hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From 51408c63baf33d95c8552f30431e1ec19a0440e0 Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 2/8] libcgroup update version 2.o

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ++++++
 .../patches/api.c-fix-infinite-loop.patch     | 38 +++++++++++++++++++
 srcpkgs/libcgroup/patches/musl-decls.patch    |  3 +-
 ...-sterror_r.patch => musl-strerror_r.patch} |  4 +-
 srcpkgs/libcgroup/template                    |  7 ++--
 5 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 create mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 rename srcpkgs/libcgroup/patches/{musl-sterror_r.patch => musl-strerror_r.patch} (99%)

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 000000000000..bd083c2aad97
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ 		} else if (pid > 0) {
+ 			exit(EXIT_SUCCESS);
+ 		}
+-
+-		/* Change the file mode mask. */
+-		umask(0);
+ 	} else {
+ 		flog(LOG_DEBUG, "Not using daemon mode\n");
+ 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 000000000000..12ee0eeebc84
--- /dev/null
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
+ 			/* Get the group data. */
+ 			sp = &(rule->username[1]);
+ 			grp = getgrnam(sp);
+-			if (!grp)
++			if (!grp) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* Get the data for UID. */
+ 			usr = getpwuid(uid);
+-			if (!usr)
++			if (!usr) {
++				rule = rule->next;
+ 				continue;
++			}
+ 
+ 			/* If UID is a member of group, we matched. */
+ 			for (i = 0; grp->gr_mem[i]; i++) {
+-- 
+2.10.2
+
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index 32a58fc7f677..eacf4e618d93 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -3,7 +3,7 @@ include file sys/cdefs.h
 
 --- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
 +++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
-@@ -16,5 +16,15 @@
+@@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
 
@@ -18,4 +18,5 @@ include file sys/cdefs.h
 +#endif /* !defined(__GLIBC__) */
 +
  #define _LIBCGROUP_H_INSIDE
+ 
  #include <libcgroup/error.h>
diff --git a/srcpkgs/libcgroup/patches/musl-sterror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
similarity index 99%
rename from srcpkgs/libcgroup/patches/musl-sterror_r.patch
rename to srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f14d325e965..0f54e12b05d2 100644
--- a/srcpkgs/libcgroup/patches/musl-sterror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -4,7 +4,7 @@ GNU libc's if _GNU_SOURCE is defined.
 --- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
 +++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
-
+ 
  const char *cgroup_strerror(int code)
  {
 +#if defined(__GLIBC__)
@@ -17,6 +17,6 @@ GNU libc's if _GNU_SOURCE is defined.
 +		return "strerror_r() failed";
 +	}
 +#endif
-
+ 
  	return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
  }
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 0b8b45d0bce4..935e9d96b222 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -3,15 +3,14 @@ pkgname=libcgroup
 version=2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
 checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
-
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 2a257f4e8f5f2b42be8114c9f8d6739f9bd6b128 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Thu, 19 Aug 2021 14:56:59 +0200
Subject: [PATCH 3/8] checksum bz2 corrected

---
 srcpkgs/libcgroup/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 935e9d96b222..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -10,7 +10,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
 distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
 		makedepends+=" musl-fts-devel"

From 977070ca2d2aba566f769aad8ba688f73883d301 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:13:07 +0200
Subject: [PATCH 4/8] upgrade to 2.0

---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 +
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 ---
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 +
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 +
 srcpkgs/CUnit/template                        |  37 +
 srcpkgs/CUnit/update                          |   1 +
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 ---
 srcpkgs/ImageMagick6/update                   |   1 -
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 ++
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 +
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 +
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 +
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 +
 .../patches/cmake-build-type-none.patch       |  16 -
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 +
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 -
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 -----
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 --
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 -
 srcpkgs/bomi/template                         |  35 -
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 --
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 +
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 +++++++++
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 ---
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 +
 .../patches/ignore-crape-compiler-test.patch  |  13 +
 srcpkgs/cmake/patches/test-none.patch         |  41 -
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 +
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 +
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 +
 srcpkgs/dnsdist/template                      |  36 +
 srcpkgs/dnsdist/update                        |   1 +
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 -
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 -
 srcpkgs/dovecot/INSTALL.msg                   |   6 -
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 -
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 -
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 +
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 -
 srcpkgs/gi-docgen/template                    |  14 +
 srcpkgs/giac/patches/pari_2_13.patch          |  16 +
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 -
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 -
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 +
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 +
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 +
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 +
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 +++
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 -
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 -
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 ++
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 +
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 -
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 +
 srcpkgs/kodi-rpi/INSTALL                      |   6 -
 srcpkgs/kodi-rpi/REMOVE                       |   5 -
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 -
 .../patches/add-missing-cassert.patch         |  20 -
 .../patches/add-missing-includes.patch        |  10 -
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 -
 .../disable-static-texturepacker-build.patch  |  11 -
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 --
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 -
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 -
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 -
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 -
 srcpkgs/kodi-rpi/template                     | 119 ---
 srcpkgs/kodi-rpi/update                       |   1 -
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 +
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 +
 srcpkgs/krita/patches/cross.patch             |  13 +
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 -
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 ++
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 +
 srcpkgs/libadwaita-devel                      |   1 +
 .../patches/disable-broken-tests.patch        |  10 +
 srcpkgs/libadwaita/template                   |  59 ++
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 -
 srcpkgs/libdecor-devel                        |   1 +
 srcpkgs/libdecor/template                     |  32 +
 srcpkgs/libe-book/patches/icu-68.patch        |  20 +
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 -
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ++++
 srcpkgs/libgnt/template                       |  31 +
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 -
 srcpkgs/libmagick6-devel                      |   1 -
 srcpkgs/libmagick6-perl                       |   1 -
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 -
 srcpkgs/libstemmer                            |   1 +
 srcpkgs/libstemmer-devel                      |   1 +
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 +
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 +
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 ++++++++
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 -
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 -
 srcpkgs/meson/patches/fix-unittest.patch      |  77 --
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 -
 srcpkgs/mu4e                                  |   1 -
 srcpkgs/mu4e/template                         |  22 +
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 ++
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 ++
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 +
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 -
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 -
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 -
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 -
 srcpkgs/nodejs-lts-10/template                |  96 ---
 srcpkgs/nodejs-lts-10/update                  |   2 -
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 +
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 +
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 -
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 +
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 -
 .../patches/02-libpurple-nm_state.patch       |  19 -
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 -
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 -
 srcpkgs/psiconv/template                      |  28 -
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 -
 srcpkgs/ptii/template                         |  14 -
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 +
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 -
 srcpkgs/python-docutils/template              |  62 --
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 +
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 -
 srcpkgs/python3-docutils/template             |  39 +
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 +
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 +
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 +
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 +
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 +
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 ---------
 .../0200-invalidate-old-v8-cache.patch        |  31 -
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 +
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 +++++
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 -
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 +
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 -
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 +
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 +
 srcpkgs/shiori/template                       |  23 +
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 +
 srcpkgs/snowball/template                     |  60 ++
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 +
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ++++++++++++++++++
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 -
 srcpkgs/sysprof/patches/musl.patch            | 157 ----
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 -
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 +
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 +
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 +
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 ++
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 +
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 +
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 +
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 +
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 +
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 +
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ++++++
 .../webkit2gtk/patches/be-typedarray.patch    |  48 ++
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 +
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 860 files changed, 6000 insertions(+), 4585 deletions(-)
 create mode 100644 srcpkgs/ART/template
 create mode 120000 srcpkgs/CUnit-devel
 create mode 100644 srcpkgs/CUnit/template
 create mode 100644 srcpkgs/CUnit/update
 delete mode 100644 srcpkgs/ImageMagick6/template
 delete mode 100644 srcpkgs/ImageMagick6/update
 create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 create mode 100644 srcpkgs/abcmidi/template
 create mode 100644 srcpkgs/alsa_rnnoise/template
 create mode 120000 srcpkgs/arcan_sdl
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 delete mode 100644 srcpkgs/bomi/template
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 create mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 create mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 delete mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 create mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 create mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 delete mode 100644 srcpkgs/cmake/patches/test-none.patch
 create mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 create mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 create mode 100644 srcpkgs/dnsdist/template
 create mode 100644 srcpkgs/dnsdist/update
 delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 delete mode 100644 srcpkgs/dovecot/INSTALL
 delete mode 100644 srcpkgs/dovecot/INSTALL.msg
 delete mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 delete mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 delete mode 100644 srcpkgs/gespeaker/template
 create mode 100644 srcpkgs/gi-docgen/template
 create mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 delete mode 100644 srcpkgs/git-lfs/INSTALL.msg
 delete mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 create mode 120000 srcpkgs/gtk4-doc
 create mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 create mode 100644 srcpkgs/hello/template
 create mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 delete mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 delete mode 100644 srcpkgs/iputils/update
 create mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 create mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 create mode 120000 srcpkgs/kodi-rpi
 delete mode 100644 srcpkgs/kodi-rpi/INSTALL
 delete mode 100644 srcpkgs/kodi-rpi/REMOVE
 delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 delete mode 100644 srcpkgs/kodi-rpi/template
 delete mode 100644 srcpkgs/kodi-rpi/update
 create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 create mode 100644 srcpkgs/krita/patches/aarch64.patch
 create mode 100644 srcpkgs/krita/patches/cross.patch
 delete mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 create mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/update
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template
 create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 delete mode 120000 srcpkgs/libgnt
 create mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 create mode 100644 srcpkgs/libgnt/template
 delete mode 120000 srcpkgs/libmagick6
 delete mode 120000 srcpkgs/libmagick6-devel
 delete mode 120000 srcpkgs/libmagick6-perl
 delete mode 120000 srcpkgs/libspa-ffmpeg
 create mode 120000 srcpkgs/libstemmer
 create mode 120000 srcpkgs/libstemmer-devel
 create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 create mode 100644 srcpkgs/linux-base/template
 create mode 100644 srcpkgs/linux4.19/templateu
 delete mode 100644 srcpkgs/lynx/update
 delete mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 delete mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 delete mode 100644 srcpkgs/mu/template
 delete mode 120000 srcpkgs/mu4e
 create mode 100644 srcpkgs/mu4e/template
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 create mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 delete mode 120000 srcpkgs/nodejs-lts-10-devel
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 delete mode 100644 srcpkgs/nodejs-lts-10/template
 delete mode 100644 srcpkgs/nodejs-lts-10/update
 create mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 create mode 100644 srcpkgs/nvidia/INSTALL
 delete mode 100644 srcpkgs/onionshare/template
 create mode 100644 srcpkgs/pari/patches/makefile.patch
 delete mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 delete mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 delete mode 100644 srcpkgs/podman/INSTALL.msg
 delete mode 120000 srcpkgs/psiconv-devel
 delete mode 100644 srcpkgs/psiconv/template
 delete mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 delete mode 100644 srcpkgs/ptii/template
 create mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 delete mode 100644 srcpkgs/python-docutils/template
 create mode 100644 srcpkgs/python3-RPi.GPIO/template
 delete mode 120000 srcpkgs/python3-docutils
 create mode 100644 srcpkgs/python3-docutils/template
 create mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 create mode 100644 srcpkgs/python3-pytest-httpserver/template
 create mode 100644 srcpkgs/python3-smartypants/template
 create mode 100644 srcpkgs/python3-typogrify/template
 create mode 100644 srcpkgs/qalculate-qt/template
 delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 delete mode 100644 srcpkgs/qt5ct/INSTALL.msg
 create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 delete mode 100644 srcpkgs/rustup/INSTALL.msg
 create mode 100644 srcpkgs/sftpgo/template
 create mode 100644 srcpkgs/shiori/files/shiori/run
 create mode 100644 srcpkgs/shiori/template
 create mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 create mode 100644 srcpkgs/snowball/template
 create mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 create mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 delete mode 100644 srcpkgs/sysprof/patches/build.patch
 delete mode 100644 srcpkgs/sysprof/patches/musl.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 create mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 create mode 100644 srcpkgs/tootle/template
 create mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 create mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 create mode 120000 srcpkgs/valadoc/patches
 create mode 100644 srcpkgs/vault-acme/template
 create mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 create mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 315e6858bfaf..320365ef921a 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,12 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires a utility to chroot and bind mount existing directories
+`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task:
-
- - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+multiple utilities to accomplish this task.
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods shown above.
+methods.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -100,6 +95,8 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
+XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -112,6 +109,11 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
+XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
+
+> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
+flag ignores the choice made in configuration files and enables `xbps-uchroot`.
+
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -138,6 +140,16 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
+#### bwrap(1)
+
+bubblewrap, sandboxing tool for unprivileged users that uses
+user namespaces or setuid.
+See <https://github.com/containers/bubblewrap>.
+
+#### ethereal
+
+Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
+
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -424,11 +436,8 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If your system does not support `user namespaces`, a privileged group is required to be able to use
-`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
-
-    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
-    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
+If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
+try other [chroot methods](#chroot-methods).
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index f533212b7daf..a6b68435eb43 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,6 +254,9 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
+		*)
+			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
+			return 1
+			;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 7f0560d2bad3..0304180a8c0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
+libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,31 +886,6 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
-libkritaversion.so.21 krita-4.4.5_1
-libkritaglobal.so.21 krita-4.4.5_1
-libkritaplugin.so.21 krita-4.4.5_1
-libkritawidgetutils.so.21 krita-4.4.5_1
-libkritawidgets.so.21 krita-4.4.5_1
-libkritastore.so.21 krita-4.4.5_1
-libkritaodf.so.21 krita-4.4.5_1
-libkritaflake.so.21 krita-4.4.5_1
-libkritabasicflakes.so.21 krita-4.4.5_1
-libkritapigment.so.21 krita-4.4.5_1
-libkritacommand.so.21 krita-4.4.5_1
-libkritalibbrush.so.21 krita-4.4.5_1
-libkritapsd.so.21 krita-4.4.5_1
-libkritacolor.so.21 krita-4.4.5_1
-libkritacolord.so.21 krita-4.4.5_1
-libkritaimage.so.21 krita-4.4.5_1
-libkritaui.so.21 krita-4.4.5_1
-libkritaimpex.so.21 krita-4.4.5_1
-libkritalibkis.so.21 krita-4.4.5_1
-libkritaqml.so.21 krita-4.4.5_1
-libkritatextlayout.so.21 krita-4.4.5_1
-libkritatext.so.21 krita-4.4.5_1
-libkritalibkra.so.21 krita-4.4.5_1
-libkritalibpaintop.so.21 krita-4.4.5_1
-libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1982,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2613,7 +2588,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.15 libfilezilla-0.30.0_1
+libfilezilla.so.16 libfilezilla-0.31.1_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2996,7 +2971,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.21 libqalculate-3.0.0_1
+libqalculate.so.22 libqalculate-3.20.1_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3119,8 +3094,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
-libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
+libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3511,6 +3486,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
+libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3522,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3678,11 +3654,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.11 libknot-3.0.0_1
+libknot.so.12 libknot-3.1.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.3 libknot-2.8.2_1
+libzscanner.so.4 libknot-3.1.0_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.2 libnsl-1.2.0_1
+libnsl.so.3 libnsl-2.0.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -4005,6 +3981,7 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
+libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4027,3 +4004,5 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index d6c530d2afd9..488cc8b2d0a4 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,30 +72,40 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
+CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
+CC-BY-3.0-DE
+CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
+CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0-FR
+CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0-DE
+CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
+CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -104,6 +114,7 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
+CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -112,6 +123,7 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
+CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -285,6 +297,7 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
+NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -338,6 +351,7 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
+OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 689f6594d3d5..0f37ba4625dd 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24b
+version=0.0.25
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
+checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 20688372e42c..93e90e139b4f 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,116 +1,3 @@
---- a/build/premake/premake5.lua
-+++ b/build/premake/premake5.lua
-@@ -85,6 +85,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		elseif string.find(machine, "e2k") == 1 then
- 			arch = "e2k"
- 		else
-@@ -863,6 +865,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "e2k" then
- 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
- 	end
---- /dev/null
-+++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
-@@ -0,0 +1,50 @@
-+/* Copyright (C) 2012 Wildfire Games
-+ * Copyright (C) 2018 Raptor Engineering, LLC
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining
-+ * a copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * routines specific to POWER
-+ */
-+
-+#include "precompiled.h"
-+
-+#include "lib/sysdep/cpu.h"
-+
-+intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
-+{
-+	return __sync_fetch_and_add(location, increment);
-+}
-+
-+bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
-+{
-+	return __sync_bool_compare_and_swap(location, expected, newValue);
-+}
-+
-+const char* cpu_IdentifierString()
-+{
-+	return "IBM POWER"; // TODO
-+}
---- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
-+++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
-+++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
-@@ -124,6 +124,7 @@
- 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
- 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
- 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
-+	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
- 
- #ifdef NDEBUG
- 	scriptInterface.SetProperty(settings, "build_debug", 0);
---- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
-+++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
-@@ -76,9 +76,15 @@
- #else
- # define ARCH_E2K 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24b
+version=0.0.25
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
+checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
new file mode 100644
index 000000000000..d84f8c8aa9af
--- /dev/null
+++ b/srcpkgs/ART/template
@@ -0,0 +1,15 @@
+# Template file for 'ART'
+pkgname=ART
+version=1.9.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
+ libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Fork of RawTherapee with additional features"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://bitbucket.org/agriggio/art/wiki/Home"
+distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
+checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 241daec8743e..a0bc5780731d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.1.3
-revision=1
-archs="i686 x86_64"
+version=2021.2
+revision=2
+archs="x86_64 aarch64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
+checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,25 +25,39 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
+	# Remove files for other OSes and/or CPU architectures
+	# Darwin (this is not packaged for macOS)
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
+	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
+	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
+	# Windows (this is not packaged for Windows)
+	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
+	rm -rf plugins/performanceTesting/bin/yjpagent.dll
+	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
+	# x86 (unsupported after v2021.1)
+	rm -rf bin/clion.vmoptions
+	rm -rf lib/pty4j-native/linux/x86
+	rm -rf plugins/performanceTesting/bin/libyjpagent.so
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+	# MIPS
 	rm -rf lib/pty4j-native/linux/mips64el
+	# ARM
+	rm -rf lib/pty4j-native/linux/arm
+	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/fsnotifier
-			rm -rf bin/clion.vmoptions
-			rm -rf bin/libyjpagent-linux.so
-			rm -rf lib/pty4j-native/linux/x86
-			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+			rm -rf lib/pty4j-native/linux/aarch64
 			;;
-		i686)
-			rm -rf bin/fsnotifier64
-			rm -rf bin/clion64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
+		aarch64)
 			rm -rf lib/pty4j-native/linux/x86-64
+			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
new file mode 120000
index 000000000000..cd42858e4b11
--- /dev/null
+++ b/srcpkgs/CUnit-devel
@@ -0,0 +1 @@
+CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
new file mode 100644
index 000000000000..f142f9ee64c9
--- /dev/null
+++ b/srcpkgs/CUnit/template
@@ -0,0 +1,37 @@
+# Template file for 'CUnit'
+pkgname=CUnit
+version=2.1.3
+revision=1
+_distver="${version%.*}-${version##*.}"
+wrksrc="CUnit-${_distver}"
+build_style=gnu-configure
+configure_args="--disable-console"
+hostmakedepends="autoconf automake libtool"
+short_desc="Unit Testing Framework for C"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="LGPL-2.0-or-later"
+homepage="http://cunit.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
+checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
+
+pre_configure() {
+	vsed -e 's@./configure@:@' -i bootstrap
+	sh bootstrap .
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
+}
+
+CUnit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
new file mode 100644
index 000000000000..90b1a7c7efd5
--- /dev/null
+++ b/srcpkgs/CUnit/update
@@ -0,0 +1 @@
+pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 4edce3b0d86f..1703283ee7d2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
deleted file mode 100644
index 7fbcb1d3150c..000000000000
--- a/srcpkgs/ImageMagick6/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'ImageMagick6'
-pkgname=ImageMagick6
-version=6.9.12.12
-revision=2
-_majorver=${version%.*}
-_patchver=${version##*.}
-wrksrc="${pkgname}-${_majorver}-${_patchver}"
-build_style=gnu-configure
-configure_args="--without-autotrace --with-wmf=yes
- --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
- --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
- --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
-hostmakedepends="automake libtool pkg-config"
-makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
- libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
- libwmf-devel ocl-icd-devel pango-devel"
-short_desc="Package for display and interactive manipulation of images"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
-license="ImageMagick"
-homepage="https://www.imagemagick.org/"
-distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
-
-keep_libtool_archives=yes
-conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
-
-subpackages="libmagick6 libmagick6-devel"
-
-conflicts="ImageMagick>=0"
-
-if [ -z "$CROSS_BUILD" ]; then
-	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
-	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
-	hostmakedepends+=" perl"
-	subpackages+=" libmagick6-perl"
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
-do_check() {
-	# Disable failing checks
-	sed -i '/validate-formats/d' Makefile
-
-	make check
-}
-
-post_install() {
-	vlicense LICENSE
-	vlicense NOTICE
-}
-
-libmagick6_package() {
-	short_desc="ImageMagick6 low-level image manipulation libraries"
-	pkg_install() {
-		vmove "usr/lib/libMagick*.so.*"
-		vmove "usr/lib/ImageMagick*"
-		vmove "usr/share/ImageMagick*"
-	}
-}
-
-libmagick6-devel_package() {
-	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
-	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
-	short_desc="ImageMagick6 low-level image manipulation development files"
-	conflicts="libmagick-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/doc
-		vmove "usr/bin/*-config"
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.la"
-		vmove "usr/share/man/man1/*-config.1"
-	}
-}
-
-libmagick6-perl_package() {
-	short_desc="ImageMagick6 perl library bindings"
-	pkg_install() {
-		vmove usr/lib/perl5
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 6a9f7e46a667..000000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
+diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
+index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
+--- a/komikku/servers/mangadex/__init__.py
++++ b/komikku/servers/mangadex/__init__.py
+@@ -82,6 +82,26 @@ class Mangadex(Server):
+
+             return None
+
++    def _manga_title_from_attributes(self, attributes):
++        if self.lang_code in attributes['title']:
++            return attributes['title'][self.lang_code]
++        elif 'en' in attributes['title']:
++            return attributes['title']['en']
++
++        else:
++            lang_code_alt_name = None
++            en_alt_name = None
++
++            for alt_title in attributes['altTitles']:
++                if not lang_code_alt_name and self.lang_code in alt_title:
++                    lang_code_alt_name = alt_title['en']
++
++                if not en_alt_name and 'en' in alt_title:
++                    en_alt_name = alt_title['en']
++
++            return lang_code_alt_name or en_alt_name
++
++
+     def get_manga_data(self, initial_data):
+         """
+         Returns manga data from API
+@@ -117,7 +137,9 @@ class Mangadex(Server):
+         attributes = resp_json['data']['attributes']
+
+         # FIXME: Should probably be lang_code, but the API returns weird stuff
+-        data['name'] = html.unescape(attributes['title']['en'])
++        _name = self._manga_title_from_attributes(attributes)
++        data['name'] = html.unescape(_name)
++        assert data['name'] is not None
+
+         for relationship in resp_json['relationships']:
+             if relationship['type'] == 'author':
+@@ -137,8 +159,14 @@ class Mangadex(Server):
+         elif attributes['status'] == 'hiatus':
+             data['status'] = 'hiatus'
+
+-        # FIXME: lang_code
+-        data['synopsis'] = html.unescape(attributes['description']['en'])
++        if self.lang_code in attributes['description']:
++            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
++        elif 'en' in attributes['description']:
++            # Fall back to english synopsis
++            data['synopsis'] = html.unescape(attributes['description']['en'])
++        else:
++            logger.warn('{}: No synopsis', data['name'])
++
+
+         data['chapters'] += self.resolve_chapters(data['slug'])
+
+@@ -280,11 +308,16 @@ class Mangadex(Server):
+             if result['type'] != 'manga':
+                 continue
+
+-            results.append(dict(
+-                slug=result['id'],
+-                # FIXME: lang_code
+-                name=result['attributes']['title']['en'],
+-            ))
++            name = self._manga_title_from_attributes(result['attributes'])
++
++            if name:
++                results.append(dict(
++                    slug=result['id'],
++                    # FIXME: lang_code
++                    name=name,
++                ))
++            else:
++                logger.warn("ignoring result {}, missing name".format(result['id']))
+
+         return results
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index a8d21545b64c..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.29.2
+version=0.30.0
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-pure-protobuf"
+ python3-natsort python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
+distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index b7304474f777..3000ca0ed3d5 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- src/lj_dispatch.c
-+++ src/lj_dispatch.c
+--- a/src/lj_dispatch.c
++++ b/src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- src/lj_dispatch.h
-+++ src/lj_dispatch.h
+--- a/src/lj_dispatch.h
++++ b/src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 8feb60601dd8..7c865859da92 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- dynasm/dasm_ppc.lua
-+++ dynasm/dasm_ppc.lua
+--- a/dynasm/dasm_ppc.lua
++++ b/dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- src/host/buildvm_asm.c
-+++ src/host/buildvm_asm.c
+--- a/src/host/buildvm_asm.c
++++ b/src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- src/lj_arch.h
-+++ src/lj_arch.h
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- src/lj_ccall.c
-+++ src/lj_ccall.c
+--- a/src/lj_ccall.c
++++ b/src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- src/lj_ccall.h
-+++ src/lj_ccall.h
+--- a/src/lj_ccall.h
++++ b/src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- src/lj_ccallback.c
-+++ src/lj_ccallback.c
+--- a/src/lj_ccallback.c
++++ b/src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- src/lj_ctype.h
-+++ src/lj_ctype.h
+--- a/src/lj_ctype.h
++++ b/src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- src/lj_def.h
-+++ src/lj_def.h
+--- a/src/lj_def.h
++++ b/src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- src/lj_frame.h
-+++ src/lj_frame.h
+--- a/src/lj_frame.h
++++ b/src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- src/lj_target_ppc.h
-+++ src/lj_target_ppc.h
+--- a/src/lj_target_ppc.h
++++ b/src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- src/vm_ppc.dasc
-+++ src/vm_ppc.dasc
+--- a/src/vm_ppc.dasc
++++ b/src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index ab6771110f90..f4e760b73836 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 9fbc72cbe4e7..5b8ab1beda11 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp0 -i ${i}
+		patch -sNp1 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 86b2abf205c3..7487ef8ad8d4 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4
-revision=1
+version=0.3.4.1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
+checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,6 +53,9 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
+	# for icu mass-rebuild
+	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
+	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 48aa4abe0b69..ddf1e5bb6038 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.3
+version=3.3.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
+checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..56636534ddae 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.4.6
-revision=3
+version=1.7.3
+revision=1
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
+checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index 030aac7a61b2..f7c5d5cd9ff8 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.12a
-revision=5
+version=3.1.13
+revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+             // The rationale for ignoring it is that the only reason to specify
+             // an alignment and a with is to get a fixed width bar, and ">" is
+             // sufficient in this implementation.
++#if FMT_VERSION < 80000
+             width = parse_nonnegative_int(it, end, ctx);
++#else
++            width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+           }
+           return it;
+         }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+   template <typename FormatContext>
+   auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++	auto& tm_format = specs;
++#endif
+     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+   }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=1
+revision=2
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
new file mode 100644
index 000000000000..c5dd100bfbc3
--- /dev/null
+++ b/srcpkgs/abcmidi/template
@@ -0,0 +1,12 @@
+# Template file for 'abcmidi'
+pkgname=abcmidi
+version=2021.06.27
+revision=1
+wrksrc=${pkgname}
+build_style=gnu-configure
+short_desc="Utilites for working with ABC files"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-2.0-or-later"
+homepage="https://ifdo.ca/~seymour/runabc/top.html"
+distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
+checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 0778d446920a..9750c4c941a0 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
+checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 95f8894703a9..ddc4f95d8449 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
+checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index e293f601b16b..a2b72606fac3 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
+checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 793eaa4db509..d3dd0188e275 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
+checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index d3505141631d..e08be40d821d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
+checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 4a2bc233f3ca..fa3c6189d6ea 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
+checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index f96f9e09634d..e55cfaf89ebf 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
+checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index e0e7f9a849c5..0aaa952d4daa 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.8.0
+version=0.9.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
+checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
new file mode 100644
index 000000000000..2472f31b7a6b
--- /dev/null
+++ b/srcpkgs/alsa_rnnoise/template
@@ -0,0 +1,14 @@
+# Template file for 'alsa_rnnoise'
+pkgname=alsa_rnnoise
+version=1.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="rnnoise-devel alsa-lib-devel"
+short_desc="RNNoise based noise removal plugin for ALSA"
+maintainer="Arsen Arsenović <arsen@aarsen.me>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
+distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
+checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index b04df1bf0003..c6b356b54976 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,22 +14,6 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
-Index: pal/cmake/Modules/AmdCmakeHelper.cmake
-===================================================================
---- a/pal/cmake/Modules/AmdCmakeHelper.cmake
-+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
-@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
- else()
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
- 
--    if (CMAKE_BUILD_TYPE AND
--        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
--        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
--    endif()
--
-     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-         set(CMAKE_BUILD_TYPE_DEBUG ON)
-         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a6c3daf619db..c01b288f2328 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.1
+version=2021.Q3.3
 revision=1
-_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
-_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
-_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
-_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
+_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
+_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
+_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
+_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
- 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
- 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
- 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
- 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
+checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
+ 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
+ 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
+ ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
+ 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=7
+revision=8
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index c6d522451779..b218b76a2e37 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.6
+version=2.12.7
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
+checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index c3d1c8e56e05..63a3e256df33 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,13 +1,14 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
+ webkit2gtk"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f436db94479c..31bf6e62eec5 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,17 +1,18 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
+ -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel
+ vlc-devel SDL2-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -74,3 +75,11 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
+
+arcan_sdl_package() {
+	short_desc+=" - SDL platform server binary"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/arcan_sdl
+	}
+}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
new file mode 120000
index 000000000000..fb6a95edcfe5
--- /dev/null
+++ b/srcpkgs/arcan_sdl
@@ -0,0 +1 @@
+arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b3fb850ee8ce..b9f15ae83c27 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.8
+version=6.9
 revision=1
-_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
+_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index a0b94ffa2be3..1665ae95f762 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
+checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 214c8a5fc61c..6a83617ae25a 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
+checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=1
+revision=2
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index fc5700641bca..8502d6e2979a 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.0
+version=0.5.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
+_sci_commit=46204fbce012f4495d691520ce545ad277a86747
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
+_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
+_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
-_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
+_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
+_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
- 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
+checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
+ 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
+ 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
+ dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
- b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
+ 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
+ a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 413568589e69..c6fc3833c0e2 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
+checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 106a032faebc..8394cdec0d3e 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
+checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index cbdb9de0abcf..74fdd0259725 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.20.0
-revision=2
+version=0.21.0
+revision=4
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version}"
+configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,8 +12,12 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
-checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
+# use a newer libbpf to fix compile issues on various targets
+# you should be able to drop this for the next update
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
+ https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
+checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
+ e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -23,6 +27,9 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
+	# use a newer libbpf with fixes
+	rm -rf src/cc/libbpf
+	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index 08885019296b..b75095dfb136 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.5
+version=1.5.6
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
+checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index e696669a3cba..c10b2b2e89d0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
+checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 7b1ba307cb65..eba7615720f4 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
+checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index ec5ad3933afd..f53a74678d11 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210621
+version=20210808
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://www.crufty.net/help/sjg/bmake.html"
-distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
+homepage="https://www.crufty.net/help/sjg/bmake.html"
+distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
deleted file mode 100644
index 3b224fd76a73..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg3.x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libavutil/audioconvert.h is gone in ffmpeg3.x
-
---- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
-@@ -26,7 +26,6 @@
- #include <assert.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/intreadwrite.h>
- #include <libavutil/common.h>
- #include <libavutil/bswap.h>
---- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
-@@ -25,7 +25,6 @@
- #include <limits.h>
- 
- #include <libavutil/common.h>
--#include <libavutil/audioconvert.h>
- 
- #include "config.h"
- #include "options/options.h"
---- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
-@@ -28,7 +28,6 @@
- #include <assert.h>
- 
- #include <libavutil/opt.h>
--#include <libavutil/audioconvert.h>
- #include <libavutil/common.h>
- #include <libavutil/samplefmt.h>
- #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
deleted file mode 100644
index fefd786df654..000000000000
--- a/srcpkgs/bomi/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
-
-diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
-index 77b1df41c5..5365525c48 100644
---- a/src/bomi/video/ffmpegfilters.hpp
-+++ b/src/bomi/video/ffmpegfilters.hpp
-@@ -6,7 +6,7 @@
- extern "C" {
- #include <video/mp_image_pool.h>
- #include <video/img_format.h>
--#include <libavfilter/avfiltergraph.h>
-+#include <libavfilter/avfilter.h>
- #include <libpostproc/postprocess.h>
- }
- #include "enum/deintmethod.hpp"
-diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
-index b322982566..d1991e1d37 100644
---- a/src/mpv/audio/out/ao_lavc.c
-+++ b/src/mpv/audio/out/ao_lavc.c
-@@ -156,8 +156,8 @@ static int init(struct ao *ao)
-         ac->buffer_size =
-             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
-     }
--    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
--        ac->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     ac->buffer = talloc_size(ac, ac->buffer_size);
- 
-     // enough frames for at least 0.25 seconds
-diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
-index 05c694702d..fb6206bc01 100644
---- a/src/mpv/common/av_common.c
-+++ b/src/mpv/common/av_common.c
-@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
-     if (size) {
-         av_free(avctx->extradata);
-         avctx->extradata_size = 0;
--        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
-+        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!avctx->extradata)
-             return -1;
-         avctx->extradata_size = size;
-@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-     avctx->channel_layout           = st->channel_layout;
-     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
-     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
--    avctx->stream_codec_tag         = st->stream_codec_tag;
-+    avctx->codec_tag         = st->codec_tag;
- }
- 
- // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
-diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
-index 2a01bee380..9c97c97a88 100644
---- a/src/mpv/common/encode_lavc.c
-+++ b/src/mpv/common/encode_lavc.c
-@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
-             if (!(*bytebuf = stream_open(buf, ctx->global))) {
-                 MP_WARN(ctx, "%s: could not open '%s', "
-                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
--                stream->codec->flags &= ~CODEC_FLAG_PASS2;
-+                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
-                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
-             } else {
-                 struct bstr content = stream_read_complete(*bytebuf, NULL,
-@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
-                 ctx->vc->long_name, ctx->vc->name);
- 
--        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
-         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
-                 ctx->ac->long_name, ctx->ac->name);
- 
--        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
-+        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
-             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
-             MP_WARN(ctx, "\n\n"
-                        "           ********************************************\n"
-diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
-index 943fb1d8af..6f438249ad 100644
---- a/src/mpv/demux/demux_lavf.c
-+++ b/src/mpv/demux/demux_lavf.c
-@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
-         // Disable file-extension matching with normal checks
-         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
-         .buf_size = 0,
--        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
-+        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
-     };
-     if (!avpd.buf)
-         return -1;
-diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
-index 22b111b0ce..62cd90ef7e 100644
---- a/src/mpv/demux/packet.c
-+++ b/src/mpv/demux/packet.c
-@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
- {
-     assert(len <= dp->len);
-     dp->len = len;
--    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- }
- 
- void free_demux_packet(struct demux_packet *dp)
-diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
-index ffd56350b6..2589faf4ec 100644
---- a/src/mpv/video/decode/vd_lavc.c
-+++ b/src/mpv/video/decode/vd_lavc.c
-@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
-         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
-     }
- 
--    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
--    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
-+    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
-+    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
- 
-     if (lavc_param->show_all) {
--#ifdef CODEC_FLAG2_SHOW_ALL
--        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
-+#ifdef AV_CODEC_FLAG2_SHOW_ALL
-+        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
- #endif
--#ifdef CODEC_FLAG_OUTPUT_CORRUPT
--        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
-+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
-+        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
- #endif
-     }
- 
-diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
-index 3a6903b7fd..895e0952a5 100644
---- a/src/mpv/video/out/vo_lavc.c
-+++ b/src/mpv/video/out/vo_lavc.c
-@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
-         goto error;
- 
-     vc->buffer_size = 6 * width * height + 200;
--    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
--        vc->buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     if (vc->buffer_size < sizeof(AVPicture))
-         vc->buffer_size = sizeof(AVPicture);
- 
-@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
- static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
- {
-     struct priv *vc = vo->priv;
--    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
--        if (!frame)
--            return 0;
--        memcpy(vc->buffer, frame, sizeof(AVPicture));
--        MP_DBG(vo, "got pts %f\n",
--               frame->pts * (double) vc->stream->codec->time_base.num /
--                            (double) vc->stream->codec->time_base.den);
--        packet->size = sizeof(AVPicture);
--        return packet->size;
--    } else {
--        int got_packet = 0;
--        int status = avcodec_encode_video2(vc->stream->codec, packet,
--                                           frame, &got_packet);
--        int size = (status < 0) ? status : got_packet ? packet->size : 0;
--
--        if (frame)
--            MP_DBG(vo, "got pts %f; out size: %d\n",
--                   frame->pts * (double) vc->stream->codec->time_base.num /
--                   (double) vc->stream->codec->time_base.den, size);
--
--        if (got_packet)
--            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
--        return size;
--    }
-+    int got_packet = 0;
-+    int status = avcodec_encode_video2(vc->stream->codec, packet,
-+            frame, &got_packet);
-+    int size = (status < 0) ? status : got_packet ? packet->size : 0;
-+
-+    if (frame)
-+        MP_DBG(vo, "got pts %f; out size: %d\n",
-+                frame->pts * (double) vc->stream->codec->time_base.num /
-+                (double) vc->stream->codec->time_base.den, size);
-+
-+    if (got_packet)
-+        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
-+    return size;
- }
- 
- static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
-
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
deleted file mode 100644
index b953146e2571..000000000000
--- a/srcpkgs/bomi/patches/fix-cxx14.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
-@@ -19,6 +19,7 @@
- }
- 
- QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+CONFIG += c++14
- 
- contains(QMAKE_CXX, clang++) {
- QMAKE_CXXFLAGS += -Wno-missing-braces
---- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
-@@ -51,8 +51,8 @@
-         };
-         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
- 
--        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
--        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
-+        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
-+        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
-         return get;
-     }();
-     auto ret = func.value(ph);
---- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
-@@ -11,7 +11,7 @@
-     QTime start, end;
-     QString mediaName;
-     Mrl mrl;
--    quint64 unix = 0;
-+    quint64 _unix = 0;
- };
- 
- #endif // FILENAMEGENERATOR_HPP
---- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
-@@ -910,7 +910,7 @@
-     g.dateTime = QDateTime::currentDateTime();
-     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
-     g.end = end.isNull() ? g.start : end;
--    g.unix = QDateTime::currentMSecsSinceEpoch();
-+    g._unix = QDateTime::currentMSecsSinceEpoch();
-     g.mrl = e.mrl();
-     g.mediaName = e.media()->name();
-     return g;
---- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
-@@ -101,7 +101,7 @@
- 
-     struct {
-         QDate date; QTime time, position;
--        quint64 unix = 0;
-+        quint64 _unix = 0;
-         QMap<QString, std::function<QString(void)>> get;
-     } ph;
-     QTimer waiter, hider, dialogWorkaround;
---- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
-@@ -255,7 +255,7 @@
- {
-     if (d->size.isEmpty())
-         return tr("No video stream exists.");
--    d->g.unix = QDateTime::currentMSecsSinceEpoch();
-+    d->g._unix = QDateTime::currentMSecsSinceEpoch();
-     d->g.dateTime = QDateTime::currentDateTime();
-     d->g.start = d->ui.a->time();
-     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
deleted file mode 100644
index 1de63a16b819..000000000000
--- a/srcpkgs/bomi/patches/fix-sysctl_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
-@@ -274,7 +274,7 @@
- 
- 
- #ifdef Q_OS_MAC
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <mach/mach_host.h>
- #include <mach/task.h>
- #include <libproc.h>
---- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
-+++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
-@@ -15,7 +15,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/types.h>
- #include <xcb/xcb.h>
- #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
deleted file mode 100644
index 4cab853148a5..000000000000
--- a/srcpkgs/bomi/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'bomi'
-pkgname=bomi
-version=0.9.11
-revision=17
-build_style=configure
-configure_args="--disable-systemd --release --prefix=/usr"
-# does not build using py3.8 because of waf issues
-hostmakedepends="python pkg-config curl perl which"
-makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
- libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
- xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
- qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
- fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
- samba-devel libchardet-devel"
-depends="qt5-quickcontrols"
-short_desc="Powerful and easy-to-use Qt5 multimedia player"
-maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://bomi-player.github.io/"
-changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
-distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
-checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # There is no <sys/sysctl.h> in musl libc
-			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
-			-i ${wrksrc}/src/bomi/os/x11.cpp
-			;;
-	esac
-}
-do_install() {
-	make DEST_DIR=${DESTDIR} install
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=4
+revision=5
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f200409ddb2f..3e467bc2928a 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=1
+revision=3
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,6 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
+nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 8318f83f05bb..fd529e18cd51 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
+checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 96ebe37136ac..f74fc4bcc987 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
+checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index af4ae3d5be8a..8bbecf811d11 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
+checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 5eef88f60e8f..812aaa4ce5c5 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.1.10
+version=1.6.3
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
+checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 9864444d2fda..fdce7ee04c7b 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210619
+version=20210808
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
+checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 9f81b95462cf..0091cc87f62e 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,15 +1,17 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
+checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
+checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
+make_check=ci-skip # segfaults only on CI
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 49fbc8086d29..1730e476dcae 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
+checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 9ecdc3112e5e..a98ca3a95d22 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.0
+version=4.16.2
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
new file mode 100644
index 000000000000..8440919128d4
--- /dev/null
+++ b/srcpkgs/catgirl/patches/add-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/ui.c
++++ b/ui.c
+@@ -47,6 +47,7 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ #include <wctype.h>
++#include <sys/file.h>
+ 
+ #ifdef __FreeBSD__
+ #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index a81b83507026..337968b71a90 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.8
+version=1.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
-checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
+distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
+checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 542a7215820d..3d7443a87dea 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index bb31b4ad323a..751b37451020 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.18
+version=2.19
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
+checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 57076066ef7a..2f17130b6638 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.91
+version=0.92
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
+checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 836aa5995a7d..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,8 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.33
-revision=1
+version=0.99.39
+revision=2
+wrksrc="${pkgname}_${version}"
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -12,8 +13,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
+distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
+checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 3094579cbb67..644b87e1fd30 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.2
+version=2.1.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
+checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..f9ab40f5ac04 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,22 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
-else
-	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
+	checkdepends="perl gnupg"
 fi
 
 do_configure() {
@@ -28,7 +25,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +35,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -46,12 +45,19 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
+	if ! [ "$CHROOT_READY" ]; then
+		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
+	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 12b30963b7c6..02a03465adf2 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.17.8
+version=3.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
+checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
new file mode 100644
index 000000000000..33f781acf11d
--- /dev/null
+++ b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
@@ -0,0 +1,364 @@
+From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
+From: John Zimmermann <me@johnnynator.dev>
+Date: Mon, 9 Aug 2021 15:56:40 +0200
+Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
+
+---
+ CMakeLists.txt        |  24 +------
+ cmake/FindClang.cmake | 130 ---------------------------------
+ cmake/FindLLVM.cmake  | 162 ------------------------------------------
+ 3 files changed, 3 insertions(+), 313 deletions(-)
+ delete mode 100644 cmake/FindClang.cmake
+ delete mode 100644 cmake/FindLLVM.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e649bfe..79fd1093 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
+ set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
+ set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
+ if (NOT CLAZY_BUILD_WITH_CLANG)
+-  find_package(Clang 8.0 MODULE REQUIRED)
++  find_package(Clang CONFIG REQUIRED)
+ 
+-  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
++  if (TARGET clang-cpp AND NOT APPLE)
+     set(default_use_clang_cpp ON)
+   else()
+     set(default_use_clang_cpp OFF)
+@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
+     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+   endif()
+ 
+-  foreach(llvm_lib ${LLVM_LIBS})
+-    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
+-        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
+-        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
+-            target_link_libraries(${name} ${llvm_lib})
+-        endif()
+-    else()
+-        target_link_libraries(${name} ${llvm_lib})
+-    endif()
+-  endforeach()
+-
+-  foreach(user_lib ${USER_LIBS})
+-    target_link_libraries(${name} ${user_lib})
+-  endforeach()
+-
+-  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
+-    target_link_libraries(${name} ${llvm_system_lib})
+-  endforeach()
++  target_link_libraries(${name} LLVM)
+ 
+   if(WIN32)
+     target_link_libraries(${name} version.lib)
+diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
+deleted file mode 100644
+index 7a40b2fb..00000000
+--- a/cmake/FindClang.cmake
++++ /dev/null
+@@ -1,130 +0,0 @@
+-# Detect Clang libraries
+-#
+-# Defines the following variables:
+-#  CLANG_FOUND                 - True if Clang was found
+-#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
+-#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
+-#
+-#  CLANG_LIBCLANG_LIB          - Libclang C library
+-#
+-#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
+-#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
+-#  ...
+-#
+-#  CLANG_LIBS                  - All the Clang C++ libraries
+-#
+-# Uses the same include and library paths detected by FindLLVM.cmake
+-#
+-# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
+-
+-#=============================================================================
+-# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (${Clang_FIND_REQUIRED})
+-    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
+-else ()
+-    find_package(LLVM ${Clang_FIND_VERSION})
+-endif ()
+-
+-set(CLANG_FOUND FALSE)
+-
+-if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
+-  macro(FIND_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-  endmacro(FIND_CLANG_LIB)
+-  macro(FIND_AND_ADD_CLANG_LIB _libname_)
+-    string(TOUPPER ${_libname_} _prettylibname_)
+-    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
+-    if(CLANG_${_prettylibname_}_LIB)
+-      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
+-    endif()
+-  endmacro(FIND_AND_ADD_CLANG_LIB)
+-
+-  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
+-  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
+-
+-  FIND_CLANG_LIB(clang-cpp)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangDriver)
+-  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangChecker)
+-  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangAST)
+-  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
+-  FIND_AND_ADD_CLANG_LIB(clangParse)
+-  FIND_AND_ADD_CLANG_LIB(clangLex)
+-  FIND_AND_ADD_CLANG_LIB(clangBasic)
+-  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
+-  FIND_AND_ADD_CLANG_LIB(clangEdit)
+-  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
+-  FIND_AND_ADD_CLANG_LIB(clangRewrite)
+-  FIND_AND_ADD_CLANG_LIB(clangSerialization)
+-  FIND_AND_ADD_CLANG_LIB(clangTooling)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
+-  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
+-  FIND_AND_ADD_CLANG_LIB(clangSema)
+-  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
+-endif()
+-
+-if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
+-  set(CLANG_FOUND TRUE)
+-else()
+-  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
+-endif()
+-
+-if(CLANG_FOUND)
+-  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
+-  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+-
+-  # check whether llvm-config comes from an install prefix
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
+-    list(APPEND CLANG_INCLUDE_DIRS
+-         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
+-         "${_llvmSourceRoot}/tools/clang/include"     # source dir
+-    )
+-  endif()
+-
+-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+-  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
+-  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
+-  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
+-  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
+-else()
+-  if(Clang_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could NOT find Clang")
+-  endif()
+-endif()
+diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
+deleted file mode 100644
+index fe7e87dd..00000000
+--- a/cmake/FindLLVM.cmake
++++ /dev/null
+@@ -1,162 +0,0 @@
+-# Find the native LLVM includes and libraries
+-#
+-# Defines the following variables
+-#  LLVM_INCLUDE_DIRS   - where to find llvm include files
+-#  LLVM_LIBRARY_DIRS   - where to find llvm libs
+-#  LLVM_CFLAGS         - llvm compiler flags
+-#  LLVM_LFLAGS         - llvm linker flags
+-#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
+-#  LLVM_INSTALL_PREFIX - LLVM installation prefix
+-#  LLVM_FOUND          - True if llvm found.
+-#  LLVM_VERSION        - Version string ("llvm-config --version")
+-#
+-# This module reads hints about search locations from variables
+-#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
+-#
+-#  Note: One may specify these as environment variables if they are not specified as
+-#   CMake variables or cache entries.
+-
+-#=============================================================================
+-# Copyright 2014 Kevin Funk <kfunk@kde.org>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# 1. Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the following disclaimer.
+-# 2. Redistributions in binary form must reproduce the above copyright
+-# notice, this list of conditions and the following disclaimer in the
+-# documentation and/or other materials provided with the distribution.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
+-    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
+-endif()
+-
+-# if the user specified LLVM_ROOT, use that and fail otherwise
+-if (LLVM_ROOT)
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
+-else()
+-  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
+-  # note: FreeBSD installs llvm-config as llvm-config35 and so on
+-  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
+-  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
+-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
+-
+-  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
+-  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
+-  if (NOT LLVM_CONFIG_EXECUTABLE)
+-    find_program(_llvmNmExecutable llvm-nm)
+-    if (_llvmNmExecutable)
+-      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
+-      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
+-      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
+-    endif()
+-  endif()
+-endif()
+-
+-set(LLVM_FOUND FALSE)
+-
+-if (LLVM_CONFIG_EXECUTABLE)
+-  # verify that we've found the correct version of llvm-config
+-  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
+-    OUTPUT_VARIABLE LLVM_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if (NOT LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
+-  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
+-    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
+-  else()
+-    set(LLVM_FOUND TRUE)
+-  endif()
+-else()
+-  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
+-endif()
+-
+-if (LLVM_FOUND)
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
+-    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
+-    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
+-    OUTPUT_VARIABLE LLVM_CFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
+-    OUTPUT_VARIABLE LLVM_LFLAGS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
+-    OUTPUT_VARIABLE LLVM_MODULE_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
+-    OUTPUT_VARIABLE LLVM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
+-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
+-    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-
+-  # potentially add include dir from binary dir for non-installed LLVM
+-  execute_process(
+-    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
+-    OUTPUT_VARIABLE _llvmSourceRoot
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
+-  if (NOT _llvmIsInstalled)
+-    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
+-  endif()
+-endif()
+-
+-if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
+-  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-elseif(_LLVM_ERROR_MESSAGE)
+-  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
+-endif()
+-
+-if (LLVM_FOUND)
+-  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
+-  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
+-  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
+-  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
+-endif()
+-- 
+2.32.0
+
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 2c958d5d481f..606384470e98 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,15 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.9
-revision=2
+version=1.10
+revision=1
 build_style=cmake
-makedepends="clang llvm"
+build_helper=qemu
+hostmakedepends="llvm"
+makedepends="clang llvm clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
-nocross="Clang cannot be installed as makedep"
+checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index a112c1dc645e..871084663bf8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.855
-revision=2
+version=1.10.3.933
+revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
+checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 11e2fa7b809d..336b67eeecf0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.20.5
+version=3.21.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,12 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
new file mode 100644
index 000000000000..3db40e27f7d3
--- /dev/null
+++ b/srcpkgs/cmake/patches/ar-lwyu.patch
@@ -0,0 +1,20 @@
+ Fix darktable build
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 5a4c6521d8..55b804d643 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
+   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
+                                 config);
+   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
+-    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++    switch (targetType) {
++      case cmStateEnums::EXECUTABLE:
++      case cmStateEnums::SHARED_LIBRARY:
++      case cmStateEnums::MODULE_LIBRARY:
++        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
++        break;
++    }
+   }
+   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
+ 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
new file mode 100644
index 000000000000..7b6ce9c16962
--- /dev/null
+++ b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+index dcdc7f1b96..37e13b6c5c 100644
+--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
++++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+@@ -11,7 +11,7 @@ project(Minimal NONE)
+ set(targets
+   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
+   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
+-  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
++  craype-Fortran-Cray-8.7
+   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
+   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
+   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
deleted file mode 100644
index e0b6886bb0a2..000000000000
--- a/srcpkgs/cmake/patches/test-none.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Thu, 1 Apr 2021 20:14:06 +0700
-Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- None is a valid CMAKE_BUILD_TYPE
-- Most of distros uses None as CMAKE_BUILD_TYPE
-- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
-  into final executable, this program requires some symbols only exist
-  when CUSTOM_CFG_OTHER is defined.
-- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
-  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
-
-Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
-
-[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
----
- Tests/ConfigSources/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
-index a3d98f685f..f83759ca10 100644
---- a/Tests/ConfigSources/CMakeLists.txt
-+++ b/Tests/ConfigSources/CMakeLists.txt
-@@ -74,10 +74,10 @@ add_custom_command(APPEND
-   VERBATIM
-   )
- foreach(n RANGE 1 5)
--  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
--  foreach(other Release RelWithDebInfo MinSizeRel)
-+  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
-     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
-   endforeach()
-+  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
- endforeach()
- add_library(Custom STATIC
-   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 7ec873cb2afd..396fb6419940 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,6 @@
 # Template file for 'cmake'
-# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.20.5
+version=3.21.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -17,14 +16,9 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
 replaces="cmake-bootstrap>=0"
 
-# XXX: cmake is broken if cmake was built with -GNinja
-# https://bugs.gentoo.org/596460
-export CMAKE_GENERATOR="Unix Makefiles"
-make_cmd=make
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -35,6 +29,7 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
+		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index fd8e518e2af6..47b52033de20 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ef1690b5d344..6688949e289e 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.9.6
+version=1.10.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
+_git_commit=db839f18ba4796df77601bfe9873756ed340525d
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
+checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index f8f525cee641..53e5e6bb3d2c 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils"
-makedepends="glib-devel python3-distro python3-peewee python3-mutagen
- python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils
+ gtk+3-devel"
+makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
+checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 82d07e947050..d9c5281e0549 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.10.5
+version=5.11.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
+checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 04da01f33962..0b8d831ee873 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.26.1
+version=0.27.0
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index b83def6d5f92..d59f52e7d40e 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.26.1
+version=0.27.0
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
+checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 4aa17ccb63d6..92652880e224 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.1
+version=5.10.2
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
+checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 6616584870f9..056584cb6bec 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.0
+version=9.2.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
+checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index c318bb54a9e4..8aa2382eb9a0 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.20.1
+version=0.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
+checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 87912c2b7fe7..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=2
+revision=4
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
+configure_args="-DCRYFS_UPDATE_CHECKS=off
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=1
+revision=2
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 6e47ac8aeead..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.3
+version=21.1.5
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index ac0e7983fafc..48cc18df5b77 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
+exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
new file mode 100644
index 000000000000..cb356dbe018b
--- /dev/null
+++ b/srcpkgs/deluge/patches/drop-priv.patch
@@ -0,0 +1,40 @@
+From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
+From: Jack O'Sullivan <jackos1998@gmail.com>
+Date: Tue, 24 Sep 2019 11:32:18 +0100
+Subject: [PATCH] Fix privilege dropping when setting process ownership
+
+`os.setgid()` should be called to set the GID, and it should be called
+before `os.setuid()` to prevent reinstatement of privileges.
+---
+ deluge/argparserbase.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
+index af9d568fa4..77866a3ed6 100644
+--- a/deluge/argparserbase.py
++++ b/deluge/argparserbase.py
+@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
+                     _file.write('%d\n' % os.getpid())
+ 
+             if not common.windows_check():
++                if options.group:
++                    if not options.group.isdigit():
++                        import grp
++
++                        options.group = grp.getgrnam(options.group)[2]
++                    os.setgid(options.group)
+                 if options.user:
+                     if not options.user.isdigit():
+                         import pwd
+ 
+                         options.user = pwd.getpwnam(options.user)[2]
+                     os.setuid(options.user)
+-                if options.group:
+-                    if not options.group.isdigit():
+-                        import grp
+-
+-                        options.group = grp.getgrnam(options.group)[2]
+-                    os.setuid(options.group)
+ 
+         return options
+ 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index ce2523384e40..622e8a4d484b 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=11
+revision=12
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 8e00e4c5579f..187eaa0437cf 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210530
+version=1.3.20210621
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
+checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 3783405a23d2..081186c5f0c8 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=178
+version=180
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
+checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 0b1918513ccd..527800ebc58b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.5
+version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
+checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index a518ed815435..6e240fb488e2 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 09d53d038ddf..e1121e376804 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
new file mode 100644
index 000000000000..130506a53b7d
--- /dev/null
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -f ./conf ] && . ./conf
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
+exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
new file mode 100644
index 000000000000..a75da37f0c49
--- /dev/null
+++ b/srcpkgs/dnsdist/template
@@ -0,0 +1,36 @@
+# Template file for 'dnsdist'
+pkgname=dnsdist
+version=1.6.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
+ --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
+ --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
+ --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
+ --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
+conf_files="/etc/dnsdist/dnsdist.conf"
+hostmakedepends="autoconf automake pkgconf"
+makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
+ lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
+short_desc="Dynamic DNS loadbalancer"
+maintainer="JailBird <jailbird@fdf.net>"
+license="GPL-2.0-only"
+homepage="https://dnsdist.org/"
+distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
+checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
+
+system_accounts="_dnsdist"
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+	# This can be removed once MUSL is updated to 1.2.x
+	broken="no y2038 support"
+fi
+
+pre_configure() {
+	export LMDB_LIBS="-llmdb"
+}
+
+post_install() {
+	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
+	vsv dnsdist
+}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
new file mode 100644
index 000000000000..da8e072d218c
--- /dev/null
+++ b/srcpkgs/dnsdist/update
@@ -0,0 +1 @@
+ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 5bde81e073f7..4a393422410e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.62.0
+version=1.63.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
+checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
deleted file mode 100644
index 62d1bc863041..000000000000
--- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
-From: Ganael Laplanche <ganael.laplanche@martymac.org>
-Date: Wed, 7 Oct 2020 21:25:29 +0200
-Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
- FreeBSD i386
-
----
- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
- Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-index fcff0db4048..80c0c4aa86d 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
-                                                     VkImageViewType view_type, VkImageLayout layout)
- {
-   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
--      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
-+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
-   if (!texture->CreateView(view_type))
-     return nullptr;
- 
-diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
-index 91d3e54eac2..3b803dd4da4 100644
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
-+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
-@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
-   VkImageView GetView() const { return m_view; }
-   VkImageLayout GetLayout() const { return m_layout; }
-   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
--  bool IsAdopted() const { return m_device_memory != nullptr; }
-+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
- 
-   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
-   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 729f66512d42..3d12d4de6563 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,11 +1,12 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.13178
+version=5.0.14790
 revision=1
-_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
+_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_commit}"
+wrksrc="dolphin-${_dolphin_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -16,11 +17,13 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
-checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
+ https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
+checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
+ d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
+post_extract() {
+	rmdir Externals/mGBA/mgba
+	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 04ef83bdd326..3cb92a3a8abc 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
+checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 0d514614a25e..c2e03b0ff62d 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
+checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 10da81b84903..254488aeae89 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.1.3
+version=4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
+checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 51528a5f3356..5d525cdec0f3 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.15
+version=0.5.16
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
+checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
deleted file mode 100644
index 3c5ade70de65..000000000000
--- a/srcpkgs/dovecot/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
-		exit 0
-	fi
-	echo "Creating self-signed certificate..."
-	usr/bin/dovecot-mkcert.sh
-	;;
-esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
deleted file mode 100644
index 2dc5444d4df9..000000000000
--- a/srcpkgs/dovecot/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-A self-signed certificate for SSL has been created automatically, but
-this should be created again with proper settings in dovecot-openssl.cnf:
-
-	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
-	$ [edit /etc/ssl/dovecot-openssl.cnf]
-	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 9c3ef4cf0af2..18affe91fe17 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.15
-revision=1
+version=2.3.16
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 8990cd6689a2..36f4191696da 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.2.4
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
+checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 7307af04e468..70643ecd550b 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=20.07
-revision=3
+version=21.07
+revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir"
+hostmakedepends="automake erlang git elixir rebar3"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
+checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 92f21f07ef4d..91200e0c3402 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.4
+version=4.1.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
+checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 98a82b875bc5..b170b225acaf 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
+checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index d24aaabc145c..093f55147690 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
+checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..310c56c03095 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=2
+revision=3
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel"
+ libnuspell-devel icu-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index f04c2e32dd0c..53573c6592a2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.4
+version=24.0.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
+checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
deleted file mode 100644
index 0cd248437214..000000000000
--- a/srcpkgs/evilwm/files/evilwm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=evilwm
-Comment=EvilWM
-Exec=evilwm
-NoDisplay=true
-X-GNOME-WMName=evilwm
-# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
-X-GNOME-Autostart-Phase=Applications
-X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 070531e719da..fc505b5da445 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,21 +1,22 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.1.1
-revision=2
+version=1.3.1
+revision=1
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="A minimalist window manager for the X Window System"
+short_desc="Minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="http://evilwm.sourceforge.net"
-distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+homepage="https://www.6809.org.uk/evilwm"
+changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
+distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
 
 pre_build() {
-	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
+	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
 }
 
 post_install() {
-	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
+	vinstall evilwm.desktop 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 57af7cf1eb6e..b04ee1b2d1cd 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.29
+version=12.30
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
+checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 484b68326218..3ebd6f056961 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
+checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index da7cf1f1bfb5..e3b98977791f 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.7
-revision=3
+version=0.8
+revision=1
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
+checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 2b8fe877a8be..4abc63302393 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,21 +1,23 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="http://www.fail2ban.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
+homepage="https://www.fail2ban.org/"
+changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
+distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
+checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
+make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 894b6332bd71..acd74c9683e1 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.4
+version=2.4.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
+checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a4b20913c9ec..bfda3ee686ca 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.19
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
+checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 6a7510d3adc3..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0c03aff7ced4..b7c0263746a2 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
+checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
deleted file mode 100644
index 0aa3f667b913..000000000000
--- a/srcpkgs/filezilla/patches/libtool_tag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
-+++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
-@@ -191,7 +191,7 @@
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-+libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
- 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 9e2300161159..8e794831bf7f 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.0
+version=3.55.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
+checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 7621cc56f091..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=90.0
+version=91.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
- e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
- 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
- d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
- 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
- d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
- 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
- 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
- baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
- c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
- 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
- d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
- 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
- e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
- 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
- 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
- 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
- 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
- ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
- ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
- 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
- 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
- cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
- 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
- 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
- f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
- 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
- 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
- d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
- f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
- 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
- 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
- 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
- c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
- 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
- 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
- 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
- b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
- e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
- 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
- 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
- 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
- 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
- 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
- da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
- 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
- fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
- fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
- bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
- 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
- a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
- f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
- ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
- 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
- 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
- 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
- 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
- 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
- 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
- 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
- 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
- eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
- c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
- 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
- e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
- e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
- 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
- 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
- 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
- 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
- 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
- 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
- fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
- 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
- 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
- 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
- b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
- 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
- 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
- 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
- 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
- ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
- b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
- fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
- 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
- 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
- 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
- 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
- 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
- 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
- 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
- ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
- 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
- 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
- ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
- e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8c61a1a7f50e..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=90.0.1
+version=91.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index aeedc7372f49..37673aa7e1b2 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
+checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=7.1.3
+version=8.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index c4fcf1d5d3f4..890f74cc8be0 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,8 +8,9 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
+changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
+checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index a07e56051e29..ef65eb9bac4c 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=7.2.6
+version=10.0.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
- 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
+ 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
+ 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index cd14abb6e1ba..284198e2261a 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.32.9
+version=0.34.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
+checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 1c4be3cac47a..aec58ce0e3ae 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
+checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 52a4365845f2..353e5a9f77cb 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.8.11
+version=1.9.7
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
+checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 07e4f2321011..bf89ee95bf17 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,9 +19,8 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
-changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
+checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=7
+revision=8
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2c735f29df7f..2ed1a5200bae 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
+checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 706577def94d..94fe54f78e47 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.1
+version=1.6.2
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
+checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index a74b1ff16cd2..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=3.38.1
+version=40.0
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dcontractor=true"
+configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel"
+ libpeas-devel gsound-devel libstemmer-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
-checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+make_check=no # tests fail with a webkit process crash
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
deleted file mode 100644
index 1b54bc36c9be..000000000000
--- a/srcpkgs/gespeaker/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gespeaker'
-pkgname=gespeaker
-version=0.8.6
-revision=3
-build_style=python2-module
-pycompile_dirs="/usr/share/gespeaker"
-hostmakedepends="gettext python"
-makedepends="python"
-depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
-short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.muflone.com/gespeaker/"
-distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
-checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
new file mode 100644
index 000000000000..85ee3aca0a2c
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_13.patch
@@ -0,0 +1,16 @@
+change in order to pass chk_fhan4 with pari-2.13
+
+This patch is already upstream in giac > 1.6 so it will be
+removed when we update giac.
+
+--- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
++++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
+@@ -88,7 +88,7 @@
+   static map<string,entree *> pari_function_table;
+   static void do_giac_pari_init(long maxprime){
+ #ifdef PARI_DYNAMIC_STACK
+-    long pari_mem_size=512000;
++    long pari_mem_size=1024000;
+ #else
+     long pari_mem_size=64000000;
+ #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ca95534498f2..3689027daf17 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=4
+revision=5
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
deleted file mode 100644
index 92448b0f4858..000000000000
--- a/srcpkgs/git-lfs/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 81f99bef2176..d0bfbc07d7b6 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index c82af3311dfb..263e2ca17c7a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.12.1
+version=1.14.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
+checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index b92478185d66..01c3990534e7 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
+checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 101c2b9a9149..431ac5b9777c 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,5 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
+checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
deleted file mode 100644
index 6e225e6aad9c..000000000000
--- a/srcpkgs/gnome-shell-mousewheel-zoom/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-shell-mousewheel-zoom'
-pkgname=gnome-shell-mousewheel-zoom
-version=0.8.0
-revision=2
-wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
-hostmakedepends="vala pkg-config"
-makedepends="libglib-devel libX11-devel"
-depends="gnome-shell"
-short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
-distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
-checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
-nopie=yes
-
-do_build() {
-	make -f makefile
-}
-
-do_install() {
-	make -f makefile DESTDIR=$DESTDIR install
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 0fb12cfa4698..d62240aeeafd 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.2
+version=40.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,17 +20,12 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
-_xdg_runtime_dir="/tmp/gnome-shell-xdg"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
+distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
+checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
 
-pre_check() {
-	mkdir "$_xdg_runtime_dir"
-	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
-	make_cmd="xvfb-run ninja"
-}
-
-post_check() {
-	rm -r "$_xdg_runtime_dir"
+do_check() {
+	mkdir /tmp/gnome-shell-xdg
+	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
+	rm -rf /tmp/gnome-shell-xdg
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index d9e2c5a9ba69..9fd5ac2f8cf2 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.6
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 403f32f96ff4..ecba40893775 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.107.1
+version=92.0.4515.131.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
+checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index c983c6e15b9f..59bf16144626 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.0
+version=0.7.1
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
+checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 6b22aec99372..035f5749e4da 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
+checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index e731c606727d..8c7b262b5dbb 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.7
+version=0.10.8
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
+checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2a84ad3954ae..db6d59810086 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
+checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 5071875a0123..caf54726953d 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,18 +1,20 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.17
+version=3.10.21
 revision=1
-wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
+ python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
+ python3-requests"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
+ python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
+ which"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
+distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
+checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 0ef1c4489c2f..336d135d1aa5 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
+checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index ae3b209ffac7..d1931e5db446 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,13 +1,14 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=1
+revision=2
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
+depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e06a589de48a..f3e4a1b60d21 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.0
+version=1.39.1
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
+checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=3
+revision=4
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
new file mode 100644
index 000000000000..76a86d16cc80
--- /dev/null
+++ b/srcpkgs/gtk4/patches/fix-sysprof.patch
@@ -0,0 +1,23 @@
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1001,6 +1001,7 @@ gtk_deps = [
+   epoxy_dep,
+   libm,
+   graphene_dep,
++  libsysprof_dep,
+ ]
+ 
+ if harfbuzz_dep.found() and pangoft_dep.found()
+diff --git a/tools/meson.build b/tools/meson.build
+index 1811b69..804e37f 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -30,7 +30,7 @@ gtk_tools = [
+                          'gtk-builder-tool-enumerate.c',
+                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
+   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
++  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
+ ]
+ 
+ if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..6441fdf8e85c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,42 +1,58 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
- -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+ -Dvulkan=$(vopt_if vulkan enabled disabled)
+ -Dsysprof=$(vopt_if sysprof enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
+ $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
+desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index e56123b92338..d8872a3b0347 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
+checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index e2883711310a..8bbdd7ef97f6 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,10 +9,11 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
+ kio-devel kwidgetsaddons-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
+checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 324bd09dc6c3..8e80af8f7268 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.0
+version=4.6.1
 revision=1
-_tagdate=2021-05-22
+_tagdate=2021-07-25
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
- dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
+checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
+ 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=3
+revision=4
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 039a2d1e0870..3706f7eb3ca3 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,6 +2,7 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
+  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 34307dbdaac9..997215b0ca70 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -f /etc/haproxy/haproxy.cfg
+exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index b4e2d8929dc3..f0f5aae0b411 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
+checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index ee03db31a273..9d8b01cf073f 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.1
-revision=1
+version=2.8.2
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel"
+makedepends="cairo-devel graphite-devel icu-devel libxml2"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
+checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index e02655aa7caa..58d9bbb6e753 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.25.1
+version=1.26.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
+checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
new file mode 100644
index 000000000000..9656bb88fadf
--- /dev/null
+++ b/srcpkgs/hello/template
@@ -0,0 +1,11 @@
+# Template file for 'hello'
+pkgname=hello
+version=2.10
+revision=1
+build_style=gnu-configure
+short_desc="Friendly greeting program"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/hello/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index e28126e3126f..eafd273b8571 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.2
+version=1.48.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
+checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 99e4876933b1..d4927fc80eac 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,18 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.2
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
+	libXrender-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://herbstluftwm.org"
+homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
+distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
+checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index dca5542d4485..5fcb79e3e351 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.19
-revision=6
+version=1.3.21
+revision=1
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
+checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index abd7b17ac15f..9c60fdf0de5b 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.2
-revision=2
+version=5.5.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
+checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index ab16766677cb..1965f18e9ea9 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.5
+version=4.8.2
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
+checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee9312836ce1..64c9d62a5a6b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.85.0
+version=0.87.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
+checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 57c01ceaabcb..85a401af5976 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210427
+version=20210731
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
+checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index ac417c59ed8e..5d2eee5705ec 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.18
+version=0.2.20
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
+checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 534115f34f0a..63de64d6aba3 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.2
-revision=2
+version=0.20.3
+revision=1
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
+checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index 7c5ebcc18c90..e6d37678c936 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.7
+version=0.7.8
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
+checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,6 +26,7 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vinstall viet-on.png 644 usr/share/ibus-bamboo
-	vcopy data usr/share/ibus-bamboo
+	vmkdir usr/share/ibus-bamboo/
+	vcopy data usr/share/ibus-bamboo/data
+	vcopy icons usr/share/ibus-bamboo/icons
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index c357948e27c2..381de5c102b5 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,22 +1,27 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.0
+version=2.0.4
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
+checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
+checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
+do_check() {
+	./test.sh python3
+}
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 189674ed9c8c..771f30d9d25f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.6.0
+version=2.7.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
+checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..2d5dea2ab028 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=67.1
+version=69.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,12 +10,16 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+
+CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
new file mode 100644
index 000000000000..6971b0490543
--- /dev/null
+++ b/srcpkgs/icu4lua/patches/icu-68.patch
@@ -0,0 +1,94 @@
+--- a/src/icu.ustring.c.orig
++++ b/src/icu.ustring.c
+@@ -38,7 +38,7 @@
+ 	target_limit = target + ICU4LUA_UBUFFERSIZE;
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_ZERO_ERROR:
+ 				icu4lua_addusize(&build_buffer, target - temp_buffer);
+@@ -100,7 +100,7 @@
+ 
+ 	for (;;) {
+ 		status = U_ZERO_ERROR;
+-		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
++		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
+ 		switch(status) {
+ 			case U_BUFFER_OVERFLOW_ERROR:
+ 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
+@@ -691,7 +691,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) < 0);
+ 	return 1;
+ }
+@@ -703,7 +703,7 @@
+ 	lua_pushboolean(L, u_strCompare(
+ 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-		TRUE
++		1
+ 	) <= 0);
+ 	return 1;
+ }
+@@ -733,7 +733,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) < 0);
+ 	}
+ 	return 1;
+@@ -759,7 +759,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) <= 0);
+ 	}
+ 	return 1;
+@@ -785,7 +785,7 @@
+ 		lua_pushboolean(L, u_strCompare(
+ 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
+ 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
+-			TRUE
++			1
+ 		) == 0);
+ 	}
+ 	return 1;
+--- a/src/icu.utf8.c.orig
++++ b/src/icu.utf8.c
+@@ -730,7 +730,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
+ 	}
+ 	return 1;
+ }
+@@ -746,7 +746,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
+ 	}
+ 	return 1;
+ }
+@@ -764,7 +764,7 @@
+ 		UCharIterator iter_b;
+ 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
+ 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
+-		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
++		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
+ 	}
+ 	return 1;
+ }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=9
+revision=10
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
deleted file mode 100644
index da8fd053b556..000000000000
--- a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <abc@pompel.me>
-Date: Fri, 23 Dec 2016 12:43:36 +0100
-Subject: [PATCH] Revert "build: Check for .pc files before using them"
-
-This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8ded66..1d54698 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
- 
- GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
- 
--PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
- AC_ARG_WITH([udevrulesdir],
- 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
- 	    [],
- 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
- 
--PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
- AC_ARG_WITH([systemdsystemunitdir],
- 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
- 	    [],
--- 
-2.11.0
-
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index a47ca09e8b2d..e5f9af8aeca5 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,20 +1,17 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.0
+version=3.1
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=meson
+configure_args="-Dsystemdsystemunitdir=false"
+hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 206bf3cbccc6..42eb463d4359 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
-checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
+make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index c25e300a103a..61cb15a40ce4 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.1
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
+checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 5da389f2ba95..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.2.0
+version=4.3.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 0c72a0c69f6c..84352b21d46b 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.7.4
+version=4.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
+checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bba897c240d2..4332867a7afc 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1.3
+version=2021.2
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.7628.21"
+wrksrc="idea-IU-212.4746.92"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
+checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,6 +30,7 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
+	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index b95b5225e80f..8c204026e90c 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.13
+version=7.15
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
+checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index f5b9aa6c0864..22bece934cd5 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210202
+version=20210722
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
+checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
deleted file mode 100644
index 7b1c488b6339..000000000000
--- a/srcpkgs/iputils/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 4233d5e56b43..bad7086f050f 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
+checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index b0f12c03fa84..24b5cfdd45ad 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 357b3296922b..25210d5aa7ed 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.1
+version=2.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
+checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 2bb8940372c3..adc3be121904 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.0.16
+version=3.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic"
+depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
+checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 4146819d4b8f..c6e27db93b52 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.14
+version=0.24.15
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
+checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 32b88c77daa7..9171c8b668b9 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
+checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 03bd5aab28e4..ff491f0439d5 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
+checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index 9bfec8bb46da..f24acbd5db1e 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
+checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index ddca78341654..c1904742de40 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
+checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index a897424b124c..d9205c7a2330 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
+checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 160f5a59ffb8..26b77d8e318e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
+checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 4a137d395e92..5bcace889805 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
+checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index a800cedd9206..8b2f487c8aad 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
+checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dab9e1652504..ff488867bf7c 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
+checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 8717280b0c3f..34b059a7400b 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
+checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0f7ee93f99f9..14b65d36f780 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
+checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 128bd65dc31b..5d748d341059 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
+checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index e1afa8c19090..a6accab96255 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
+checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2447699df2bb..2c2270301425 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
+checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 64128ae04de3..26c10e049c35 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
+checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 9b6939ce5503..b3340820387c 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
+checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index c78bbf08f009..3ee5cada287d 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
+checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3ae72ca1d28..0474a31e5ad5 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
+checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 09b6edeababa..ceaccb292c25 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
+checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 446d538cc2b6..b8f874258648 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
+checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index a34e04c82828..bcbc054d198c 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
+checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 52af12a6e734..86ae8ff6b7a1 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
+checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 8fde5371a1c0..604327d927c4 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
+checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 2e712db38ec6..825cec00e537 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
+checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 1fd8a886343a..af46183798ff 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
+checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
new file mode 100644
index 000000000000..a9a04ad493dc
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-fix-build.patch
@@ -0,0 +1,67 @@
+From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Nov 2020 16:41:27 +0100
+Subject: [PATCH] Fix build with newer Qt
+
+---
+ src/KDb.cpp | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/KDb.cpp b/src/KDb.cpp
+index 5c3b601f..ee92c2ee 100644
+--- a/src/KDb.cpp
++++ b/src/KDb.cpp
+@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+             if (val < 32 || val >= 127 || val == 39 || val == 92) {
+-                str[new_length++] = '\\';
+-                str[new_length++] = '\\';
+-                str[new_length++] = '0' + val / 64;
+-                str[new_length++] = '0' + (val % 64) / 8;
+-                str[new_length++] = '0' + val % 8;
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QLatin1Char('\\');
++                str[new_length++] = QChar::fromLatin1('0' + val / 64);
++                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
++                str[new_length++] = QChar::fromLatin1('0' + val % 8);
+             } else {
+-                str[new_length++] = val;
++                str[new_length++] = QChar::fromLatin1(val);
+             }
+         }
+     } else {
+         for (int i = 0; i < size; i++) {
+             const unsigned char val = array[i];
+-            str[new_length++] = intToHexDigit(val / 16);
+-            str[new_length++] = intToHexDigit(val % 16);
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
++            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
+         }
+     }
+     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
+-        str[new_length++] = '\'';
++        str[new_length++] = QLatin1Char('\'');
+     } else if (type == BLOBEscapingType::ByteaHex) {
+-        str[new_length++] = '\'';
+-        str[new_length++] = ':';
+-        str[new_length++] = ':';
+-        str[new_length++] = 'b';
+-        str[new_length++] = 'y';
+-        str[new_length++] = 't';
+-        str[new_length++] = 'e';
+-        str[new_length++] = 'a';
++        str[new_length++] = QLatin1Char('\'');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char(':');
++        str[new_length++] = QLatin1Char('b');
++        str[new_length++] = QLatin1Char('y');
++        str[new_length++] = QLatin1Char('t');
++        str[new_length++] = QLatin1Char('e');
++        str[new_length++] = QLatin1Char('a');
+     }
+     return str;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
new file mode 100644
index 000000000000..0de68b1e5de3
--- /dev/null
+++ b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
@@ -0,0 +1,33 @@
+From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Sun, 13 Dec 2020 19:16:30 +0530
+Subject: [PATCH] include KDEInstallDirs as first thing
+
+Otherwise ECMGeneratePriFile won't get correct paths and will install
+pri file in wrong place and things wanting to use kdb with qmake won't
+work.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3219e967..e3f98b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
+ kdb_add_examples(OFF)
+ 
+ # ECM
++include(KDEInstallDirs)
+ include(ECMGeneratePriFile)
+ include(ECMInstallIcons)
+ include(ECMOptionalAddSubdirectory)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+-include(KDEInstallDirs)
+ include(KDECMakeSettings NO_POLICY_SCOPE)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(ECMSetupQtPluginMacroNames)
+-- 
+GitLab
+
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=5
+revision=6
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 4f05af765ec9..11b039b3b657 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
+checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 1642e3e66ec9..937dfcf16ce2 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
+checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2930fef7e503..0f300600be07 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
+checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 868138cf8d80..ce089d21190b 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.04.2
+version=21.08.0
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index f195da674aad..89d23991de1c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
+checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 9a78724762d0..c7b7cd872d90 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,14 +1,17 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
- qt5-qmake python3 kdoctools kcoreaddons gettext"
+configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
+hostmakedepends="extra-cmake-modules qt5-host-tools
+ pkg-config wayland-devel qt5-qmake python3 kdoctools
+ qt5-wayland kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
+ qqc2-desktop-style-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -16,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
+checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index e1b046b3444e..35834b0744e3 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
+checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 41d1cecb0200..9b21be7d32e9 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
+checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 2f4efec922ba..fb46926635f0 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
+checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b7b60258515c..f86887024b51 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
+checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index d8ec4da62191..129b96eae6db 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index eab83068c6eb..b82b8106ba6a 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
+checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index e8d8d27d3870..d6709e9e961e 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
+checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 1d2b208ea692..0b274f4bfc43 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
+checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 37b2bbab27cd..b4bb8b2997f8 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
+checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 44e1ed2db5be..23048d46218a 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
+checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 997b080751bc..75efb323317a 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
+checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 8c70a18925f3..5b4c765ae56c 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
+checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 35b0ba3244d6..1a361d9f6b68 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
+checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 4c317ee41425..000000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- a/src/kbookmarkmodel/tests/CMakeLists.txt
-+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 13f47fec262a..f686c5a690be 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
+checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index be9fbcd7f1b6..f6c68c41a11b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
+checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 54c86c5c0073..8b8486abe517 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
+checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 91b1488f06d6..a43adab3b411 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
+checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index ccc47bd5060d..5408fa7c7f46 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
+checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index fe948d173906..8ec8ab168258 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
+checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 8d8720e7b89b..d25b4d6828de 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
+checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 00e615ba7c78..37c3a880b2a5 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
+checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
+make_check=ci-skip
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 4d343ec7d101..968304987e8b 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
+checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index fe2f0ca84e83..6262be84f6d2 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
+checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index af4d8153d24a..6615183f1d95 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
+checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 0bfcf87cf5d2..91840cb37eeb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
+checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 2c877d6c8e85..79201f2fca38 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
+checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index e90a6a4934a6..32ba74bfe113 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
+checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index effde273ba73..af9a093cb6df 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
+checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 1c54b7ca86a1..5708c8b337e0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
+checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index d610520b0d0f..febeb317e2eb 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
+checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 7d651c7059eb..beda10fe75c0 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
+checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index bc4167671a8d..e42e43c42069 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
+checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 4321316b2dc5..076a0a3c97eb 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
+checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index cce6a33917b3..8dfc9aa52089 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
+checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 05a2627354b0..8c13608f1ff1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
+checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 87416ec77c3c..42b3794143f6 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
+checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 27c4a9d4c609..c1b480632f22 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
+checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index fb6ae93be7cf..88dd3e27af33 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
+checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 0ec0f9907068..741c5499b210 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
+checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 1707f41deca8..062dff7273ec 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
+checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index c08d887702bf..cf752b7a7c5e 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.21.1
+version=0.23.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
+checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..a649948389f3 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
+distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index a582bcd9c158..7d85faa4c6f7 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
+checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c111a263ce5b..c88189b38369 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
+checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index a0599558af0c..2777e0cc20e9 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
+checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 8f73aaf2e1df..1b0c8d8ef589 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
+checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 943aeb6c40fe..050929a2716a 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
+checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 1d0a6514c6a1..d60bc5d08bb6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
+checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index e53ce5a73948..76e1ecab1829 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
+checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index a900262ed727..b65b26a98436 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kdoctools kconfig kcoreaddons"
+ gettext kcmutils kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
+checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index bf810b2b9a16..550333029393 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
+checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index ab3c4e19a5bf..aae8726719e4 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
+checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index e117dcf0e19d..8f9be660bdde 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
+checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index f5b19b2f56e9..a5cb94248ad0 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
+checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 0bc10f28c014..b6c5b2145bfb 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
+checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 52e57d789abc..6f169788a94c 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
+checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9eff87a5746d..6c15b266cee1 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,17 +1,18 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
+depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
+checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c4dc8cbb16e5..4bf6eb337684 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
+checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index b4a39a09a30c..4015c0373adc 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,24 +1,25 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.2
-revision=1
+version=5.4.0
+revision=2
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints"
+ -Droot_hints=/var/lib/knot-resolver/root.hints
+ -Dkres_gen_test=false"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel"
+ libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
+checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 30e14c63e4c8..4c41e7638803 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.0.8
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
+checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 91b2abe6c23c..448c72232d83 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
+checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 8d3731c953cb..99c2b3e21727 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
+checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
-	mkdir -p var/lib/xbmc
-	chown xbmc:xbmc var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
-	rm -rf var/lib/xbmc
-	;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
-  *  See LICENSES/README.md for more information.
-  */
- 
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
- 
- #include "GUIDialogProfileSettings.h"
- 
-+#include <cassert>
- #include <utility>
- 
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
- 
- class CURL;
- 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
-   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
-   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
--  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
- 
--  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
--  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
- 
-   include(SelectLibraryConfigurations)
-   select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
- 
--#include <guid.h>
-+#include <Guid.hpp>
- 
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
- 
- std::string StringUtils::CreateUUID()
- {
--  static GuidGenerator guidGenerator;
--  auto guid = guidGenerator.newGuid();
-+  auto guid = xg::newGuid();
- 
-   std::stringstream strGuid; strGuid << guid;
-   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- 	cd $(PLATFORM); cp -a $(SOURCE)/* .
- 	cd $(PLATFORM); ./autogen.sh
--	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
- 
- 
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
- 
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t     __off_t;
- typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    uint64_t *ppos = (uint64_t *) pos;
-+    *ppos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
--      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+    const uint64_t *ppos = (const uint64_t *) pos;
-+    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef  __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
- 
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
-+  elseif(CPU MATCHES ppc64le)
-+    set(ARCH ppc64le-linux)
-+    set(NEON False)
-+  elseif(CPU MATCHES ppc64)
-+    set(ARCH ppc64-linux)
-+    set(NEON False)
-   else()
-     message(SEND_ERROR "Unknown CPU: ${CPU}")
-   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
- 
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
-   m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
-   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
-   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
- 
--  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+  m_file = fopen(logFilename.c_str(), "wb");
-   if (!m_file)
-     return false; // error, can't open log file
- 
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
- 
- #include <string>
- 
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
-   void PrintDebugString(const std::string& debugString);
-   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
--  FILEWRAP* m_file;
-+  FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
-	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
-	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
-		  LDFLAGS+=" -latomic";;
-	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
-	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
-	find -type f | \
-		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
-		xargs sed -i  -e "s;-isystem;-I;g"
-
-	. /etc/profile.d/10_openjdk11.sh
-
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-		done
-	fi
-}
-
-post_install() {
-	# remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
-	vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=2
+revision=3
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
+
+kodi-rpi_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 16982cd70b2c..0d4d55ac34a8 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
+checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 397c3ad1892b..5a69f5ed3637 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
+checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 432f416b54e4..b78d3e4b66b1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
+checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5d486dd26f83..ad458eb6a3c9 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
+checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 1160895e97c5..9a7381d25361 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,23 +1,16 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=20.12.2
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
+ knewstuff-devel qca-qt5-devel"
 short_desc="User friendly IRC client for KDE"
-maintainer="TheNumb <me@thenumb.eu>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
+checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
 python_version=3
-
-# Package build options
-build_options="qca"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="qca"
-fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index e0b7811dedf6..f09749c6d380 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
+checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 174d2b4ad975..719ff2a4fea5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
+checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 98715a3ed096..4c362e16727a 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
+checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2bebfc4a9c9d..2f9870e4d9bf 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
+checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 58b03357e86a..ae6bedbf12a0 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
+checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index fb5604b5646e..2df5204090f2 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
+checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 90071213a666..3d2da25a160e 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
+checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index b4ddcdedf730..76ae722205e9 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
+checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 98c4527210fc..bc303c6edbf9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
+checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index c54b3d71f40c..135a694e4e39 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
+checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
new file mode 100644
index 000000000000..ca73fa48f14e
--- /dev/null
+++ b/srcpkgs/krita/patches/aarch64.patch
@@ -0,0 +1,19 @@
+We do already provide a desktop GL build of qt5,
+so assuming that AArch64 is a OpenGL ES platform
+is wrong for us
+
+--- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-09 13:40:50.981311691 +0200
+@@ -7,12 +7,6 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
+-if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
+-    add_definitions(-DQT_OPENGL_ES_3)
+-    add_definitions(-DHAS_ONLY_OPENGL_ES)
+-    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+-endif()
+-
+ add_subdirectory( tests )
+ 
+ if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
new file mode 100644
index 000000000000..b9e6138498bf
--- /dev/null
+++ b/srcpkgs/krita/patches/cross.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
++++ -	2021-08-08 14:01:32.004000529 +0200
+@@ -124,8 +124,8 @@
+ ENDMACRO(ADD_SIP_PYTHON_MODULE)
+ 
+ else()
+-    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
+-    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
++    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ 
+     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
+         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
deleted file mode 100644
index ad1bc36f142c..000000000000
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-@@ -2,7 +2,7 @@
- Categories=Qt;KDE;Office;Graphics;
- Exec=krita %F
- Icon=krita
--MimeType=image/jpeg;jpeg/jfif
-+MimeType=image/jpeg
- Name=Krita
- Name[af]=Krita
- Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index e909366f539d..015a680e64b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.5
+version=4.4.7
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
+checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index ab6cb073c9f2..84546523107f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
+checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 9a19f2714add..83a6e1fc42f3 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
+checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index f8dfcde1db63..555b5e25f8ae 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
+checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index f202558398ca..0de26ae4a40d 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
+checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f09268c68706..9636fbaeeb61 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
+checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f8f2a92c3c16..834291b349c7 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
+checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index ce4b29a14b1d..05b954fd3047 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
+checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 60fd29499e7d..46691f2b1fef 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
+checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index db7e67d19c05..a8904623a597 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
+checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index f6a379e0ffcb..66e278038d8c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
+checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 805e94c6e2d1..9ac886b6ffd3 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
+checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index e5ca7479c5e4..161e4f500393 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
+checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index e15e6d92e2b1..3e7da55c5243 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
+checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 32e1ed4fcbf9..d87baffafd9f 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
+checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index d15680d6929b..70b1974d9b40 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
+checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 95f46ea5c576..3fb2b2494e38 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.04.1
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
+checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 0c2b2b9b01ba..5d425f8f20fb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
+checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 93d1c1bc3993..d94a2a3afbb0 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.20.2
+version=1.21.3
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
+checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 1a4041e07310..65e7553e7360 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
+checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index d9567e529663..82485f2763c6 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.0
+version=0.20.1
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
+checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index a05672a75a86..0cb96dd25730 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
+checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 4c936f532b4f..65d82f8f3389 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
+checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index e3b6bb075cb2..cc8f89f18ed8 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
+checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 6e6ba14d63dd..98ebb198a89d 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
+checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 340e2d82c6da..9f8a624a91f2 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
+checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 8ec6a6f1e6d0..46de4df6a625 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
+checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 4e0566d36b13..bb133b36e569 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
+checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 25696bec47df..860a20f4e894 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
+checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index afca95e9da80..0c6a37793cc0 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
+checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2cce32e3793e..9f68371bd25c 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
+checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index e0c2b7a7564c..f1e7da924f80 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
+checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 6486fdc52423..7d6a7f194160 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
+checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7cdfb5c627..f81374deff25 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.0
+version=1.6.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
+checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index c862b593e21c..76afd6ef29f4 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
+checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
new file mode 100644
index 000000000000..630d748009e5
--- /dev/null
+++ b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
@@ -0,0 +1,42 @@
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 27 Jul 2021 11:46:19 +1000
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
+
+These keys are all defined through a macro in the form:
+   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
+
+The _EVDEVK macro is simply an offset of 0x10081000.
+Let's parse these lines correctly so those keysyms end up in our
+hashtables.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/util/makekeys.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
+index e847ef4c..4896cc53 100644
+--- a/src/util/makekeys.c
++++ b/src/util/makekeys.c
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+         return 1;
+     }
+ 
++    /* See if we can parse one of the _EVDEVK symbols */
++    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
++    if (i == 2 && (tmp = strstr(key, "XK_"))) {
++        memcpy(prefix, key, (size_t)(tmp - key));
++        prefix[tmp - key] = '\0';
++        tmp += 3;
++        memmove(key, tmp, strlen(tmp) + 1);
++
++        *val += 0x10081000;
++        return 1;
++    }
++
+     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+      * immediately: if the target is in the form XF86XK_foo, we need to
+      * canonicalise this to XF86foo before we do the lookup. */
+-- 
+GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index fa008a24b734..202fcdb18432 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index dd6263d3a420..263597769d19 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.3
+version=2.3.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="$XORG_SITE"
+homepage="https://www.x.org"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
+checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..6b49f233b3ec
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-${_ver}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
+ $(vopt_if gir vala-devel) gettext sassc"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+checkdepends="xvfb-run"
+short_desc="GTK4 building blocks for modern adaptive applications"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=3
+revision=4
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index cd498fb3ef79..763e662bf25a 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.51
+version=2.52
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
+checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..d490f3537ca6 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
+checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..3aa2069d4ab2
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 104bd0679585..6bec957dc867 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.30.0
+version=0.31.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
+checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=9
+revision=10
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
deleted file mode 120000
index d5dc3b19c846..000000000000
--- a/srcpkgs/libgnt
+++ /dev/null
@@ -1 +0,0 @@
-pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index d5dc3b19c846..28acf62a72ac 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-pidgin
\ No newline at end of file
+libgnt
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
new file mode 100644
index 000000000000..060ced3d0c1f
--- /dev/null
+++ b/srcpkgs/libgnt/patches/cross-fix.diff
@@ -0,0 +1,130 @@
+diff --git a/meson.build b/meson.build
+index 1084c82..7f824b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
+ # Check for ncurses and other things used by it
+ #######################################################################
+ ncurses_available = true
+-ncurses_inc = []
+-# The order of this list is important to the condition that follows.
+-ncurses_libs = [
+-	compiler.find_library('ncursesw', required : false),
+-	compiler.find_library('panelw', required : false),
+-	compiler.find_library('tinfow', required : false),
++ncurses_widechar = true
++ncurses_header = 'ncurses.h'
++# Some distros put the headers in ncursesw/, some don't. These are ordered to
++# pick the last available as most-specific version.
++ncursesw_header_paths = ['', 'ncursesw/']
++ncurses = [
++	dependency('ncursesw', required : false),
++	dependency('panelw', required : false),
+ ]
+-if not ncurses_libs[0].found() or not ncurses_libs[1].found()
+-	ncurses_available = false
+-endif
+-
+-if host_machine.system() == 'windows'
+-	# FIXME: $host ?
+-	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
++if ncurses[0].found() and ncurses[1].found()
++	foreach location : ncursesw_header_paths
++		f = location + 'ncurses.h'
++		if compiler.has_header_symbol(f, 'get_wch',
++		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
++			ncurses_header = f
++		endif
++	endforeach
+ else
+-	ncurses_sys_prefix = '/usr'
+-endif
+-
+-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
+-                    ncurses_sys_prefix + '/include']
+-
+-if ncurses_available
+-	# Some distros put the headers in ncursesw/, some don't
+-	found_ncurses_h = false
+-	foreach location : ncurses_sys_dirs
+-		f = location + '/ncurses.h'
+-		if not found_ncurses_h
++	ncurses_available = false
++	ncurses_inc = []
++	ncurses_libs = [
++		compiler.find_library('ncursesw', required : false),
++		compiler.find_library('panelw', required : false)
++	]
++	if ncurses_libs[0].found() and ncurses_libs[1].found()
++		foreach location : ncursesw_header_paths
++			f = location + 'ncurses.h'
+ 			if compiler.has_header_symbol(f, 'get_wch',
+ 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
+-				if location != '.'
+-					ncurses_inc += [include_directories(location)]
+-				endif
+-				found_ncurses_h = true
++				ncurses_available = true
++				ncurses_header = f
+ 			endif
++		endforeach
++		if ncurses_available
++			ncurses = declare_dependency(
++			    include_directories : ncurses_inc,
++			    dependencies : ncurses_libs
++			)
+ 		endif
+-	endforeach
+-
+-	if not found_ncurses_h
+-		ncurses_inc = []
+-		ncurses_libs = []
+-		ncurses_available = false
+ 	endif
+-else
++endif
++if not ncurses_available
+ 	# ncursesw was not found. Look for plain old ncurses
+-	# The order of this list is important to the condition that follows.
+-	ncurses_libs = [
+-		compiler.find_library('ncurses', required : false),
+-		compiler.find_library('panel', required : false),
+-		compiler.find_library('tinfo', required : false),
++	ncurses = [
++		dependency('ncurses', required : false),
++		dependency('panel', required : false),
+ 	]
+-	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
+-	gnt_config.set('NO_WIDECHAR', true)
++	if ncurses[0].found() and ncurses_libs[1].found()
++		ncurses_available = true
++	else
++		ncurses_libs = [
++			compiler.find_library('ncurses', required : false),
++			compiler.find_library('panel', required : false),
++		]
++		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
++		ncurses = declare_dependency(dependencies : ncurses_libs)
++	endif
++	ncurses_widechar = false
++endif
++if not ncurses_available and host_machine.system() == 'windows'
++	# Try pdcurses too.
++	ncurses_header = 'curses.h'
++	ncurses_libs = compiler.find_library('pdcurses', required : false)
++	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
++	ncurses = declare_dependency(dependencies : ncurses_libs)
+ endif
+ if not ncurses_available
+ 	error('ncurses could not be found!')
+ endif
+-
+-ncurses = declare_dependency(
+-    include_directories : ncurses_inc,
+-    dependencies : ncurses_libs
+-)
++gnt_config.set('NCURSES_HEADER', ncurses_header)
++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
+ 
+ libgnt_SOURCES = [
+ 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
new file mode 100644
index 000000000000..f362d1561357
--- /dev/null
+++ b/srcpkgs/libgnt/template
@@ -0,0 +1,31 @@
+# Template file for 'libgnt'
+pkgname=libgnt
+version=2.14.2
+revision=1
+build_style=meson
+build_helper=gir
+hostmakedepends="pkg-config glib-devel gtk-doc"
+makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
+short_desc="GLib Ncurses Toolkit"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://keep.imfreedom.org/libgnt/"
+distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
+checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
+
+pre_configure() {
+	# disable doc for cross builds
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i "/subdir('doc')/d" meson.build
+	fi
+}
+
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgnt.so
+	}
+}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 7993283e1161..a5d83a5a4615 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
+checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index 507c17ec3534..b8b024e392df 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,24 +1,56 @@
-diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
-index f0eaf01..5fc7cc2 100644
---- a/src/libical-glib/CMakeLists.txt
+--- a/src/libical-glib/CMakeLists.txt.orig
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,16 +1,10 @@
+@@ -1,25 +1,9 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
--# build the src-generator
--add_executable(src-generator
+ # build ical-glib-src-generator
+-add_executable(ical-glib-src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
+-)
+-
+-target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
+-
+-install(
+-  TARGETS ical-glib-src-generator
+-  EXPORT IcalGlibSrcGenerator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
+-)
+-install(
+-  EXPORT IcalGlibSrcGenerator
+-  NAMESPACE native-
+-  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
-+       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
++  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
  )
  
--target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
  list(APPEND API_FILES
-   api/i-cal-array.xml
-   api/i-cal-attach.xml
+@@ -72,22 +56,10 @@
+   list(APPEND xml_files ${xml_file_fullpath})
+ endforeach()
+ 
+-if(CMAKE_CROSSCOMPILING)
+-  # import native ical-glib-src-generator when cross-compiling
+-  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
+-    CACHE FILEPATH
+-    "Path to exported ical-glib-src-generator target from native build"
+-  )
+-  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
+-  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
+-else()
+-  set(ical-glib-src-generator_EXE ical-glib-src-generator)
+-endif()
+-
+ add_custom_command (
+   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
+-  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
+-  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
++  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
++  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
+ )
+ 
+ configure_file(
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..73888d413a3e 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.8
-revision=3
+version=3.0.10
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,8 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
-disable_parallel_build=yes
+checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index bd946e222c28..baa82053faa5 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-license="GPL-2.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 6361bb405ee7..ef558a68d6a5 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.17.3
+version=1.18.1
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
+checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 408b0c4fb929..916818e67d55 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.0
+version=2.1.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
+checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index f267e3647406..8f434c2de903 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
+checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 64afa6149368..2807f8951def 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
+checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 3d23b6d14697..fe37d8a34f5e 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
+checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index dea1ddb1d778..c9d22689b28c 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
+checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 29c834de2ad8..9069aa997c98 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
+checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 61cfdf975a1b..bbea66be21d6 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
+checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 4117eda0a701..cea014a80813 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
+checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index ace1e39ab733..2234221a9282 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
+checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index cff6281337b2..45d67934bc23 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
+checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index c230b0a355d2..7f2793c1273e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
+checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 465a7c39532c..44e5e3590225 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
+checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index e9c424286e90..1c825b988d51 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
+checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-devel
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
deleted file mode 120000
index 235c8fb44d97..000000000000
--- a/srcpkgs/libmagick6-perl
+++ /dev/null
@@ -1 +0,0 @@
-ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index 28ded1e2b78e..daabc077e556 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.24.8
+version=1.26.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
+checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index ee2752000e8d..d4f516f61ed9 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=1.3.0
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
+checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
deleted file mode 120000
index c9c97cf67072..000000000000
--- a/srcpkgs/libspa-ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
new file mode 120000
index 000000000000..80a797598ae2
--- /dev/null
+++ b/srcpkgs/libstemmer-devel
@@ -0,0 +1 @@
+snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 0be82e73d963..55a2d9c23b05 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.5.0
+version=7.6.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
+checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index cfe7e2150eaf..3e139e9a4313 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.5.0
+version=7.6.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
+checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 94f82b23780c..72eef6cd2627 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=7
+revision=8
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="Custom"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
-checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
+license="MIT"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC"
+CFLAGS="-fPIC -fno-delete-null-pointer-checks"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,3 +23,7 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+post_install() {
+	vlicense COPYRIGHT
+}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 537a5f588923..90fe3e9533cb 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.6
+version=1.1.0
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
+checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+     else if (handler->uconv_out != NULL) {
+         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-                              TRUE);
++                              1);
+     }
+ #endif /* LIBXML_ICU_ENABLED */
+     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
new file mode 100644
index 000000000000..249f21fa27f2
--- /dev/null
+++ b/srcpkgs/linux-base/template
@@ -0,0 +1,18 @@
+# Template file for 'linux-base'
+pkgname=linux-base
+version=2021.07.21
+revision=1
+build_style=meta
+short_desc="Linux kernel base dependencies"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="Public Domain"
+homepage="https://voidlinux.org/"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		;;
+esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index ce6aace3950b..cf200e66935f 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,25 +1,15 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=4.14
-revision=2
+version=5.10
+revision=1
 build_style=meta
-homepage="http://www.voidlinux.org/"
+depends="linux${version} linux-base"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public domain"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*|aarch64*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-esac
+license="Public Domain"
+homepage="http://www.voidlinux.org/"
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 33463643fc20..50ff91aef896 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,30 +1,15 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.12
+version=5.13
 revision=1
 build_style=meta
+depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		_depends_headers="linux${version}-headers"
-		;;
-	arm*)
-		depends="linux${version}"
-		_depends_headers="linux${version}-headers"
-		;;
-	*) ;;
-esac
-
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="${_depends_headers}"
+	depends="linux${version}-headers"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 26333a498bb8..8e1e1745b55a 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.189 Kernel Configuration
+# Linux/powerpc 4.19.203 Kernel Configuration
 #
 
 #
@@ -681,6 +681,7 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3490,6 +3491,7 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c3e04295a50d..67421760be1b 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.198
+version=4.19.204
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
+checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
new file mode 100644
index 000000000000..3767d43fe13a
--- /dev/null
+++ b/srcpkgs/linux4.19/templateu
@@ -0,0 +1,331 @@
+# Template file for 'linux4.19'
+pkgname=linux4.19
+version=4.19.203
+revision=1
+wrksrc="linux-${version}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="GPL-2.0-only"
+homepage="https://www.kernel.org"
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
+checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
+python_version=3
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+archs="i686* x86_64* arm* aarch64* ppc*"
+hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ openssl-devel perl uboot-mkimage tar xz"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
+
+do_configure() {
+	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
+	cp -a $FILESDIR/DocBook -t Documentation
+
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (defconfig+allmodconfig).
+	local arch subarch _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_args} oldconfig
+	else
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_args} defconfig
+		make ${makejobs} ARCH=$arch ${_args} allmodconfig
+	fi
+	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+do_build() {
+	local arch _cross _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+	esac
+	if [ "$CROSS_BUILD" ]; then
+		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	fi
+	if [ "${_patchver}" ]; then
+		_version="EXTRAVERSION=${_patchver}"
+	fi
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux \
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add docbook makefile
+	install -Dm644 Documentation/DocBook/Makefile \
+		${hdrdest}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* p*";;
+		arm|arm64) _args="x86* p*";;
+		powerpc) _args="arm* x86* parisc";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 m* s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols
+	msg_normal "$pkgver: extracting debug info, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux4.19-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux4.19-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
+	}
+}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 166ec208003b..59d695ee3dad 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.53
+version=5.10.58
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
+checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index aa1278b6821d..dac04fe87a96 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.0 Kernel Configuration
+# Linux/i386 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,7 +2152,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3603,9 +3602,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4277,7 +4281,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6476,7 +6480,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6514,6 +6520,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6671,6 +6678,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8871,7 +8879,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9207,11 +9214,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index ad8478459b42..7e08591b96da 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.1 Kernel Configuration
+# Linux/powerpc 5.13.10 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,9 +3138,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3915,6 +3920,7 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7380,11 +7386,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 4fac974c2420..184035eafa1c 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.13.0 Kernel Configuration
+# Linux/x86 5.13.9 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,7 +2220,6 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3677,9 +3676,14 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+
+#
+# Wireless WAN
+#
 CONFIG_WWAN=y
-CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
+# end of Wireless WAN
+
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4348,7 +4352,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=y
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6537,7 +6541,9 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6549,7 +6555,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6575,6 +6581,7 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6677,7 +6684,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_CX2072X=m
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6731,6 +6738,7 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9027,7 +9035,6 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9386,11 +9393,6 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
-CONFIG_PSTORE_ZONE=m
-CONFIG_PSTORE_BLK=m
-CONFIG_PSTORE_BLK_BLKDEV=""
-CONFIG_PSTORE_BLK_KMSG_SIZE=64
-CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index be7bd8b88dff..5e633de474f4 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.6
+version=5.13.10
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
+ 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index ea9cab58c2a7..b89dfe76536c 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.123 Kernel Configuration
+# Linux/powerpc 5.4.140 Kernel Configuration
 #
 
 #
@@ -3649,6 +3649,7 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 7aeca32a409f..db76c8c8845e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.135
+version=5.4.141
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
+checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 589905230dec..464e0fc07e67 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake"
-makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
- readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake openssh zlib-devel"
+makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
+ pcre-devel readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
+checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,7 +22,11 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src bin2c ptimec \
+	make -C src/tools bin2c \
+		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
+		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
+		LDFLAGS= LIBS=
+	make -C src ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index 0d8baea35fde..d202e4fc2a49 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=1
+revision=2
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 5b2345a991d2..3e5af4c38a16 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.5
+version=0.8.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
+checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 84244374086e..6ec7a39b4e7a 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,9 +1,8 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.8.9.1
-revision=5
-_distver="${version%.*}rel.${version##*.}"
-wrksrc="lynx${_distver}"
+version=2.9.0dev.9
+revision=1
+wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -11,8 +10,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
-checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
+checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
deleted file mode 100644
index 8079512abebb..000000000000
--- a/srcpkgs/lynx/update
+++ /dev/null
@@ -1,5 +0,0 @@
-case "$version" in
-	*.*.*.*) version=${version%.*}rel.${version##*.};;
-esac
-
-ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 7dd0f766de2b..35f9177b3048 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
+checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index d65697ef725c..6ad5524055b2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
+checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index efa8b676d395..171ae1c373b1 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.04.3
+version=21.08.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
+checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 5faf8d334280..49fdd57a51f6 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.40
+version=5.7.90
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
+checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
+	vinstall masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 2850d0700945..86257c4735ec 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.10
+version=2.16.11
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
+checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 6cb7381f281b..380ceeb46467 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.10
+version=0.4.12
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
+checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index f861e382184a..281f97ef6dd4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.3
+version=3.20.4
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
+checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 1f48965c139b..30857ffad05b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 8443dbfc01e1..655b4bf4d45e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,8 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.5
+version=21.1.7
 revision=1
-wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -23,7 +22,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
+checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -152,9 +151,10 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
+	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,6 +162,13 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
+if [ "$_have_zink" ]; then
+	_gallium_drivers+=",zink"
+	makedepends+=" vulkan-loader"
+fi
+
+configure_args+=" ${_gallium_drivers}"
+
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
deleted file mode 100644
index 3eefcff8e115..000000000000
--- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-+++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
-@@ -403,7 +403,7 @@
- 
-     def _get_gir_dep(self, state):
-         if not self.gir_dep:
--            kwargs = {'native': True, 'required': True}
-+            kwargs = {'native': False, 'required': True}
-             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
-             self.gir_dep = holder.held_object
-             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
deleted file mode 100644
index 8f73249b9f86..000000000000
--- a/srcpkgs/meson/patches/fix-unittest.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Mon Feb 1 00:26:49 2021 -0300
-
-    tests/common: fix " 37 has function" test on musl systems.
-    
-    This commit fixes the test that asserts on whether the lchmod() function
-    should have been detected as available by Meson. It does so by assuming
-    that on Linux systems not using glibc, the function will be available.
-    
-    - fix comment about lchmod on Linux: musl has implemented the function
-    correctly since 2013, so the assumption in the test wasn't correct.
-    Furthermore, musl doesn't use glibc's stub mechanism.
-    - fix include to receive __GLIBC__ definition: including almost any
-    header in glibc will end up defining __GLIBC__, since most headers
-    include <features.h>. The <gnu/libc-version.h> header was probably
-    chosen because of its name, but its actual purpose is defining functions
-    for checking glibc version at runtime (instead of what the binary was
-    built with), so it isn't necessary to use it. Since it is a completely
-    non standard header, including it makes the test suite fail on musl due
-    to not finding the header.
-
-diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
-index 26f13d6fa..a59480c2d 100644
---- a/test cases/common/39 has function/meson.build	
-+++ b/test cases/common/39 has function/meson.build	
-@@ -44,11 +44,13 @@ foreach cc : compilers
-     error('Found non-existent function "hfkerhisadf".')
-   endif
- 
--  # With glibc on Linux lchmod is a stub that will always return an error,
--  # we want to detect that and declare that the function is not available.
--  # We can't check for the C library used here of course, but if it's not
--  # implemented in glibc it's probably not implemented in any other 'slimmer'
--  # C library variants either, so the check should be safe either way hopefully.
-+  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
-+  # always return an error, we want to detect that and declare that the
-+  # function is not available.
-+  # We can't check for the C library used here of course, but the main
-+  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
-+  # also, it has implemented lchmod since 2013, so it should be safe to check
-+  # that lchmod is available on Linux when not using glibc.
-   if host_system == 'linux' or host_system == 'darwin'
-     assert (cc.has_function('poll', prefix : '#include <poll.h>',
-                             args : unit_test_args),
-@@ -57,15 +59,24 @@ foreach cc : compilers
-     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
- 
-     if host_system == 'linux'
--      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
--      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
--      message('GLIBC vetsion:', glibc_vers)
-+      # __GLIBC__ macro can be retrieved by including almost any C library header
-+      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
-+      # __GLIBC__ will only be set for glibc
-+      if glibc_major != ''
-+        glibc_print = 'hi "@0@" hi'.format(glibc_major)
-+        message(glibc_print)
-+        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
-+        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
-+        message('GLIBC version:', glibc_vers)
- 
--      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
--      if glibc_vers.version_compare('<2.32')
--        assert (not has_lchmod, '"lchmod" check should have failed')
-+        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
-+        if glibc_vers.version_compare('<2.32')
-+          assert (not has_lchmod, '"lchmod" check should have failed')
-+        else
-+          assert (has_lchmod, '"lchmod" check should have succeeded')
-+        endif
-       else
-+        # Other C libraries for Linux should have lchmod
-         assert (has_lchmod, '"lchmod" check should have succeeded')
-       endif
-     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index bb484ec3e45e..48ca095572d9 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-reverts="0.58.1_1"
-version=0.56.2
-revision=3
+version=0.58.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -15,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
+checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 34e378b634cc..5c88da7b1c59 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
+checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 8852268ba921..ceaaed3ad430 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,13 +8,12 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
-hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
+checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 2b7dd627c36f..305cc7cccd9e 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
+checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 1e7fd575868f..8933f760cd3d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.20
+version=2.9.21
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
+checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b86cbf85393..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=59.0.0
-revision=1
+version=60.0.0
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
+checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index a3d6685a95b0..b77a3eb88d6f 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
+checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=2
+revision=3
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 91eb32904c85..163b2ab2d204 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.18.0
+version=1.19.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
+checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index e401ff3d8733..06c060661d38 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.0
+version=5.28.1
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
+checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 53ab96eca22e..39d3b1d8a193 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
+checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-# CUnit dependency is missing
-make_check=no
+make_check="ci-skip"
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,6 +32,11 @@ post_extract() {
 	esac
 }
 
+pre_check() {
+	# fd, addr = self._accept() # socket.timeout: timed out
+	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
+}
+
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0e1c2fda7f85..2325cfd80d99 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.5
+version=0.5.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview-devel gspell-devel"
+makedepends="gtksourceview4-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
+checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=2
+revision=3
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 6943fd07c09c..1e0f1fb6860a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.9
+version=0.22.10
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
+checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
deleted file mode 100644
index 6e5e816b5ca9..000000000000
--- a/srcpkgs/mu/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'mu'
-pkgname=mu
-version=1.6.0
-revision=1
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
-maintainer="Benjamin Slade <slade@jnanam.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
-
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" emacs"
-else
-	configure_args+=" --disable-mu4e"
-fi
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
-
-if [ ! "$CROSS_BUILD" ]; then
-	mu4e_package() {
-		short_desc+=" - Emacs frontend"
-		depends="${sourcepkg}-${version}_${revision} emacs"
-		pkg_install() {
-			vmove usr/share/emacs
-			vmove usr/share/info
-			vmove usr/share/doc/mu/mu4e*
-		}
-	}
-fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
deleted file mode 120000
index 4f9d522cd3ad..000000000000
--- a/srcpkgs/mu4e
+++ /dev/null
@@ -1 +0,0 @@
-mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
new file mode 100644
index 000000000000..b27460c9cabe
--- /dev/null
+++ b/srcpkgs/mu4e/template
@@ -0,0 +1,22 @@
+# Template file for 'mu4e'
+pkgname=mu4e
+version=1.6.3
+revision=1
+wrksrc="mu-${version}"
+build_style=gnu-configure
+configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
+hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
+short_desc="Maildir-utils indexer/searcher and associated Emacs client"
+maintainer="Benjamin Slade <slade@lambda-y.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
+checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
+replaces="mu<${version}"
+provides="mu-${version}_${revision}"
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
new file mode 100644
index 000000000000..39af72b0c5f9
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
@@ -0,0 +1,56 @@
+From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 26 Oct 2020 15:56:25 -0400
+Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
+
+pthread_cond_wait arranged for requeued waiters to wake when the mutex
+is unlocked by temporarily adjusting the mutex's waiter count. commit
+54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
+PI mutexes by repurposing the waiter count field of the mutex
+structure. since then, for PI mutexes, the waiter count adjustment was
+misinterpreted by the mutex locking code as indicating that the mutex
+is non a non-recoverable state.
+
+it would be possible to special-case PI mutexes here, but instead just
+drop all adjustment of the waiters count, and instead use the lock
+word waiters bit for all mutex types. since the mutex is either held
+by the caller or in unrecoverable state at the time the bit is set, it
+will necessarily still be set at the time of any subsequent valid
+unlock operation, and this will produce the desired effect of waking
+the next waiter.
+
+if waiter counts are entirely dropped at some point in the future this
+code should still work without modification.
+---
+ src/thread/pthread_cond_timedwait.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index d1501240..f5f37af1 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,14 +146,13 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
+-	if (!node.next) a_inc(&m->_m_waiters);
+-
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+-	if (node.prev)
+-		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
+-	else
+-		a_dec(&m->_m_waiters);
++	if (node.prev) {
++		int val = m->_m_lock;
++		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
++		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+ 	if (e == ECANCELED) e = 0;
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
new file mode 100644
index 000000000000..b356e38b61f8
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
@@ -0,0 +1,48 @@
+From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 11:21:06 -0400
+Subject: fix missing-wake regression in pthread_cond_wait
+
+the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
+not entirely correct. while it's true that setting the waiters flag
+ensures that the next unlock will perform a wake, it's possible that
+the wake is consumed by a mutex waiter that has no relationship with
+the condvar wait queue being processed, which then takes the mutex.
+when that thread subsequently unlocks, it sees no waiters, and leaves
+the rest of the condvar queue stuck.
+
+bring back the waiter count adjustment, but skip it for PI mutexes,
+for which a successful lock-after-waiting always sets the waiters bit.
+if future changes are made to bring this same waiters-bit contract to
+all lock types, this can be reverted.
+---
+ src/thread/pthread_cond_timedwait.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index f5f37af1..a0cd4904 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -146,12 +146,17 @@ relock:
+ 
+ 	if (oldstate == WAITING) goto done;
+ 
++	if (!node.next && !(m->_m_type & 8))
++		a_inc(&m->_m_waiters);
++
+ 	/* Unlock the barrier that's holding back the next waiter, and
+ 	 * either wake it or requeue it to the mutex. */
+ 	if (node.prev) {
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
++	} else if (!!(m->_m_type & 8)) {
++		a_dec(&m->_m_waiters);		
+ 	}
+ 
+ 	/* Since a signal was consumed, cancellation is not permitted. */
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
new file mode 100644
index 000000000000..2cc943f26f6a
--- /dev/null
+++ b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
@@ -0,0 +1,28 @@
+From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Fri, 30 Oct 2020 16:50:08 -0400
+Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
+
+introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
+---
+ src/thread/pthread_cond_timedwait.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/thread/pthread_cond_timedwait.c')
+
+diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
+index a0cd4904..6b761455 100644
+--- a/src/thread/pthread_cond_timedwait.c
++++ b/src/thread/pthread_cond_timedwait.c
+@@ -155,7 +155,7 @@ relock:
+ 		int val = m->_m_lock;
+ 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
+ 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
+-	} else if (!!(m->_m_type & 8)) {
++	} else if (!(m->_m_type & 8)) {
+ 		a_dec(&m->_m_waiters);		
+ 	}
+ 
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a429ccaf999a..d30c99a563a0 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=8
+revision=9
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 43da90697848..0c45112f40a8 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=08
+version=09
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
+checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index c27fbc9cef8f..ce6d5d318aa8 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.00
+version=10.95.01
 revision=1
-_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
-_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
+_githash=311a6622e576349fdcf13a4b015911fab4d6f190
+_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
- 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
+checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
+ 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 6e6ef97dbee0..dc7d2ffffe9b 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.84.0
+version=5.85.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
+checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd0b19da95c6..73b460d23e53 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=5
+revision=6
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,6 +55,7 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
+		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 7b4e258a55e6..fb454061f7c6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
+checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
deleted file mode 120000
index 2591e8fa6508..000000000000
--- a/srcpkgs/nodejs-lts-10-devel
+++ /dev/null
@@ -1 +0,0 @@
-nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
-     '__MIPSEL__'  : 'mipsel',
-     '__mips__'    : 'mips',
-     '__PPC64__'   : 'ppc64',
--    '__PPC__'     : 'ppc64',
-+    '__PPC__'     : 'ppc',
-     '__x86_64__'  : 'x64',
-     '__s390__'    : 's390',
-     '__s390x__'   : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
-       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
-   // Some C libraries, notably Musl, define the regs member as a void pointer
-+  #if !V8_TARGET_ARCH_32_BIT
-   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
-   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
-   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+  #else
-+  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+  #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
- 
- #if V8_HOST_ARCH_PPC && \
--    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
- 
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+    defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
-	nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
-	local _args
-
-	export LD="$CXX"
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-			arm*) _args="--dest-cpu=arm" ;;
-			aarch64*) _args="--dest-cpu=arm64" ;;
-			ppc64*) _args="--dest-cpu=ppc64" ;;
-			ppc*) _args="--dest-cpu=ppc" ;;
-			mipsel*) _args="--dest-cpu=mipsel" ;;
-			mips*) _args="--dest-cpu=mips" ;;
-			i686*) _args="--dest-cpu=x86" ;;
-			x86_64*) _args="--dest-cpu=x86_64" ;;
-			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-		esac
-		_args+=" --without-snapshot"
-	fi
-	./configure --prefix=/usr --shared-zlib \
-		$(vopt_if icu --with-intl=system-icu) \
-		$(vopt_if http_parser --shared-http-parser) \
-		$(vopt_if ssl --shared-openssl) \
-		$(vopt_if libuv --shared-libuv) \
-		$(vopt_if nghttp2 --shared-nghttp2) \
-		$(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
-	else
-		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
-	fi
-}
-
-do_check() {
-	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
-	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
-	rm $DESTDIR/usr/include/node/openssl -rf
-	vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
-	short_desc+=" (development files)"
-	conflicts="nodejs-devel nodejs-lts-devel"
-	pkg_install() {
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
new file mode 100644
index 000000000000..5818349fb9b0
--- /dev/null
+++ b/srcpkgs/noise-repellent/patches/fix-cross.patch
@@ -0,0 +1,28 @@
+--- a/meson.build	2020-01-04 02:27:45.000000000 +0100
++++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
+@@ -17,19 +17,19 @@
+ if meson.get_compiler('c').get_id() == 'clang'
+   add_global_arguments('-mrecip', language : 'c')
+ endif
+-cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
+ cflags += ['-Wno-unused-function']
+ 
+ #install folder
+ install_folder = 'nrepel.lv2'
+ 
+-#get the build operating system and configure install path and shared object extension
+-current_os = build_machine.system()
+-current_arch = build_machine.cpu_family()
++#get the host operating system and configure install path and shared object extension
++current_os = host_machine.system()
++current_arch = host_machine.cpu_family()
+ 
+ # Add x86_64 optimization where appropriate (not for ARM)
+-if current_arch != 'aarch64'
+-    cflags += ['-msse','-msse2','-mfpmath=sse']
++if current_arch == 'x86_64'
++    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
+ endif
+ 
+ # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index a682812b9d9b..c064532d6540 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.4
+version=0.1.5
 revision=1
-build_style=gnu-makefile
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
+checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 989de0f270be..c9ca266b1ca1 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.1
+version=1.1.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
+_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
+checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 278c10f6d9bf..0023919a6ace 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.11
+version=2.3.13
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
+checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index c1568b0a3c28..9512a55f958d 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.68
+version=3.69
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
+checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index d1f2ae62f5e0..0e4ba1c87c84 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
new file mode 100644
index 000000000000..2461dca609f6
--- /dev/null
+++ b/srcpkgs/nvidia/INSTALL
@@ -0,0 +1,3 @@
+case "${ACTION}" in
+post) ldconfig -X || : ;;
+esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2ebd8c1b5e49..1a4e10bd5bec 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.57.02
+version=470.63.01
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
 # Template file for 'octave'
 pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
 build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+	# List of supported architectures copied from openblas.
+	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+		makedepends+=" openblas-devel"
+		configure_args=" --with-blas=openblas --with-lapack=openblas"
+		;;
+	*)
+		makedepends+=" blas-devel lapack-devel"
+		;;
+esac
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index f7ffb8217f4e..905c81f78714 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.1
+version=3.0.0
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
+checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 30626aa8aa78..f251b18c9e1c 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
+checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 11468a8b04cf..12a46936c990 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
deleted file mode 100644
index 4a1754648932..000000000000
--- a/srcpkgs/onionshare/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'onionshare'
-pkgname=onionshare
-version=2.2
-revision=5
-build_style=python3-module
-pycompile_dirs="/usr/share/nautilus-python/extensions"
-hostmakedepends="python3-setuptools"
-depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
- python3-pysocks python3-requests python3-stem tor"
-short_desc="Share files anonymously and securely"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://onionshare.org/"
-changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
-distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
-checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
-
-conf_files="/etc/apparmor.d/local/*"
-
-post_install() {
-	vmkdir etc/apparmor.d
-	vcopy "apparmor/*" etc/apparmor.d/
-}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index c06f3dda3557..7547a3281f08 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.0.8
-revision=3
+version=2.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
+checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 27b4fe86d906..17b0c7e7b293 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217
+version=1.217.1
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
- c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
+checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
+ e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 3ba99f7b2664..955517561869 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.16.0
-revision=2
+version=1.17.0
+revision=1
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
+checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index c73913b4e9d7..7120d39bae20 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.0
+version=1.4.1
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
+checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 558f7e19e8fb..0ae052a88f75 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.7
+version=0.13.8
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
+checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=2
+revision=3
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 72f96715a11f..f81e15760a7c 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210621
+version=20210809
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
+checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 78b0f41d3cbe..9698f63059b6 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
+checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 86c06124e7b6..7de5c6902149 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
+checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 1b36efc1f38a..5e101a4a4e4f 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
+checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8f2a9952d847..d84e94c7b93b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.11.4
-revision=2
+version=2.14.0.3
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
+checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index f8010c4b1591..ba9b550b2fc5 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index e02791536387..fb3c0b000924 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210701
+version=20210802
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
+checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
new file mode 100644
index 000000000000..ec1db15a78c4
--- /dev/null
+++ b/srcpkgs/pari/patches/makefile.patch
@@ -0,0 +1,36 @@
+Add targets to main makefile:
+ - gp-dyn
+ - gp-sta
+ - lib-dyn
+ - lib-sta
+ - install-lib-dyn
+ - install-bin-dyn
+
+Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
+
+Otherwise, running several targets with -j is broken.
+
+Examples:
+
+1. "make -j8 gp lib-sta lib-dyn" fails once in a while
+
+2. "make -j8 doc docpdf" fails every time
+
+With .NOTPARALLEL, both seem to work reliably.
+
+Reference:
+https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
+
+--- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
++++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
+@@ -42,7 +42,9 @@
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
++
++.NOTPARALLEL:
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 8e2a415913ba..4f2a2cbef9b7 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,24 +1,29 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.1
+version=2.13.2
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr"
-make_build_target=all
-make_check_target=test-all
+configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
+make_build_target="gp lib-sta lib-dyn doc"
+make_check_target=statest-all
+make_install_target="install install-lib-sta install-lib-dyn"
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
+checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
 
-build_options="x11"
-build_options_default="x11"
+build_options="x11 pthreads"
+build_options_default="x11 pthreads"
+desc_option_pthreads="Enable support for pthreads"
+
+# reduce speed losses due to pthreads
+CFLAGS="-flto -fno-semantic-interposition"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -50,6 +55,7 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 095f4ee8aa44..8ee9c968b7d1 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,12 +1,6 @@
---- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
-+++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python3
- 
- """
- #    Display PC/SC functions arguments
-@@ -22,12 +22,7 @@
+--- a/src/spy/pcsc-spy
++++ b/src/spy/pcsc-spy
+@@ -21,12 +21,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index ad9e221bfbc7..13cb8c3581f4 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.1
+version=1.9.3
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause"
+license="BSD-2-Clause, GPL-3.0-or-later"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
+checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index da0f12a2e0ee..7a0ac1b625f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.071
+version=2.072
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
+checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 469ab7ed715b..d7e1de548189 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.040
+version=2.041
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
+checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 7c9efeb266ed..290fe6eec91e 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002006
-revision=2
+version=0.002009
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
+checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index be6c064720eb..8b6024657d6a 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.07
+version=5.09
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs"
+checkdepends="perl-Test-Needs perl-Business-ISBN"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
+checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index c7ae7418c417..81ba180885c2 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.03
+version=2.04
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
+checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=4
+revision=5
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
deleted file mode 100644
index 2e82aaae330c..000000000000
--- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
-+++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
-@@ -1428,7 +1428,7 @@
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- 	if test "x$enable_nm" = "xyes" ; then
--		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
- 			AC_SUBST(NETWORKMANAGER_CFLAGS)
- 			AC_SUBST(NETWORKMANAGER_LIBS)
- 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
deleted file mode 100644
index fd11e320c209..000000000000
--- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
-+++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
-@@ -939,8 +939,16 @@
- #if NM_CHECK_VERSION(0,8,992)
- 		case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(0,8,992)
-+			if (prev != NM_STATE_CONNECTED_LOCAL &&
-+				prev != NM_STATE_CONNECTED_SITE &&
-+				prev != NM_STATE_CONNECTED_GLOBAL &&
-+				prev != NM_STATE_UNKNOWN)
-+				break;
-+#else
- 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
- 				break;
-+#endif
- 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
- 				ui_ops->network_disconnected();
- 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index a2668cf685eb..b9dc82b75dee 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.13.0
-revision=3
+version=2.14.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
-python_version=2 #unverified
+checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
+python_version=2
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="libglib-devel gtk+-devel libXext-devel
+makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel"
+ libsasl-devel libSM-devel farstream-devel libgnt-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,23 +55,7 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-libgnt_package() {
-	short_desc="IM library extracted from Pidgin (GNT)"
-	pkg_install() {
-		vmove "usr/lib/libgnt*.so*"
-		vmove usr/lib/finch
-		vmove usr/lib/gnt
-	}
-}
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc="IM library extracted from Pidgin (GNT) - development files"
-	pkg_install() {
-		vmove usr/include/gnt
-		vmove usr/lib/pkgconfig/gnt.pc
-		vmove usr/lib/libgnt.so
-	}
-}
+
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index d93880ef3aee..c7babbe84d8b 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
+checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 15abe63db703..0333eb6d6f43 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
+checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index dd2a57fa3b42..426ebde5d844 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -11,7 +11,7 @@
- #undef fastcall
+@@ -8,7 +8,7 @@
+ #define __PROFILER_FULL_TYPE_EXPANSION__
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index 40812890ec7a..a598006e74c6 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210203
+version=20210723
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
+checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index bb1afcf4501a..421b96fe8269 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,15 +1,19 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.5.1
-revision=2
+version=0.6
+revision=1
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="python3-flake8"
+checkdepends="flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
+checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-Dtests=false"
+fi
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index b61c6a74e63e..2e7da142b0c2 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,13 +97,6 @@ libspa-control_package() {
 	}
 }
 
-libspa-ffmpeg_package() {
-	short_desc+=" - ffmpeg plugins"
-	pkg_install() {
-		vmove usr/lib/spa-0.2/ffmpeg
-	}
-}
-
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index d772476fbd32..a18b089b1431 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.7
+version=1.2021.9
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
+checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b482e38a0c71..89163820425e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
+checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0f2a9eb0bd8..cb1f29dc714d 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
+checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 1b099314dd10..2070048c11e1 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
+checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 4a976e299038..d86aa3f5e567 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
+checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 27ed2a7eee29..34fa0f29be3e 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
+checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 6d6ba8a6771b..63144055607a 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
+checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index f09a1d9842d6..a039cddfd026 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
+checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index d3f6d65fb009..4617693b8cdb 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
+checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 9293ebff9373..af714465c0b8 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
+checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 3c6eed9d92d3..0d7c9db2b951 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
+checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index e377165f57f4..ad765127a0b0 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
+checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index b1c90df102bb..af2b590df791 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
+checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 3c9d3370994b..527ffb7856d8 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
+checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 0c7495ad3dbd..9157efd47628 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
- DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
+ -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
+checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
deleted file mode 100644
index d9090de158e7..000000000000
--- a/srcpkgs/podman/INSTALL.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-`fuse-overlayfs` has been added as a runtime dependency to podman.
-podman will now prefer this storage driver to the `vfs` fallback driver.
-If you have existing containers that rely on the `vfs` driver, podman
-will display an error and refuse any further operation.
-
-To switch to the new storage driver, podman has to be reset:
-
-    # podman system reset
-
-To instead keep using the `vfs` driver, add
-
-    [storage]
-    driver="vfs"
-
-to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 5808c7122ae7..6db65f96cffa 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.2
+version=3.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,9 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
+changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
+checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 1345b747a3a6..20411de08e7d 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.3
+version=5.22.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
+checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index f4ec111d3f9d..905fca01a26f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.20
+version=3.0.21
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
+checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 80d321fb726c..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.1
-revision=1
+version=3.6.2
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
+checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index abefe9159680..bb5effa3e01d 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 21e894f61e98..24df39ae050f 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.2
+version=3.1.3
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,19 +13,21 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index e73a8e6d351a..69cc6f504e51 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,19 +12,21 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt"
+checkdepends="libxslt CUnit-devel"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
+checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
 nocross="FIXME: Cannot run test program to determine PROJ version"
-# unit tests require unpackaged cunit
-# regression tests require running postgresql
-make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
+
+pre_check() {
+	# regression tests require running postgresql
+	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 108fd8a1e5b4..b8f2ad8f964d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.22
-revision=2
+version=9.6.23
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index 01921d026193..ba2bccadc5de 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K[\d.]+(?!\w)"
+pattern="v\K9[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 288837212561..b11aaa840f04 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.7
-revision=2
+version=12.8
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
+checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index f298809db626..9c6a33935ba3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.3
-revision=2
+version=13.4
+revision=1
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
+checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index b15853ea561a..a3b7ffbe5279 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
+checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index 36d4d6b42400..b2b64531cd16 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.8
+version=1.0.9
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
+checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 36998655dc1c..bca8024269a1 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
+checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 7d0ac6a3946d..33502549bd51 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.9
+version=0.11.10
 revision=1
 build_style=configure
 configure_args="
@@ -26,8 +26,9 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
+changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
+checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 6409fe71dc89..b95d67533565 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.5.2
+version=1.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,6 +9,13 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
+changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
+checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
 make_check=no # no tests in pypi tarball
+
+post_install() {
+	# Remove `protontricks-desktop-install`, since we
+	# already install .desktop files properly.
+	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
+}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 04425cc36211..940585a857d5 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,15 +1,17 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.6
-revision=1
-wrksrc="linux-cli-${version}"
+version=2.2.11
+revision=2
+wrksrc="linux-cli-community-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
+depends="openvpn python3-pythondialog python3-docopt python3-requests
+ python3-Jinja2 python3-distro"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
-checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
+distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
+checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
+make_check=no # Package Defines No Checks
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
deleted file mode 120000
index 1e97358ed578..000000000000
--- a/srcpkgs/psiconv-devel
+++ /dev/null
@@ -1 +0,0 @@
-psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
deleted file mode 100644
index 1e574d489dc3..000000000000
--- a/srcpkgs/psiconv/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'psiconv'
-pkgname=psiconv
-version=0.9.9
-revision=9
-build_style=gnu-configure
-configure_args="--disable-xhtml-docs"
-hostmakedepends="pkg-config libmagick6-devel"
-makedepends="libmagick6-devel"
-conf_files="/etc/psiconv/*"
-short_desc="Conversion utility for EPOC32 (Psion) files"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://frodo.looijaard.name/project/psiconv"
-distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
-checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
-
-CFLAGS="-fcommon"
-
-psiconv-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/psiconv-config
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
deleted file mode 100644
index 23aac81eef88..000000000000
--- a/srcpkgs/ptii/patches/fix-installpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Adjust install paths and add LICENSE to installed files.
-
---- a/Makefile	2014-02-10 10:36:26.000000000 +0100
-+++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
-@@ -26,7 +26,8 @@
- 
- install: all
- 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
--	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
-+	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
-+	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
- 
- uninstall:
--	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
-+	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
deleted file mode 100644
index 572d59daad4d..000000000000
--- a/srcpkgs/ptii/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'ptii'
-pkgname=ptii
-version=0.4
-revision=2
-build_style=gnu-makefile
-makedepends="inotify-tools-devel"
-short_desc="Simple program you can use with ii"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="WTFPL"
-homepage="http://git.z3bra.org/cgit.cgi/ptii/"
-distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
-checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
-
-LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 0720da479e03..eb38341cd570 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
+checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index e4efe58debd4..cf385472c433 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.75
+version=0.76
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,9 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
+changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
+checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index eac8cc48a1e6..7a1c38fda94e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.37
+version=3.38
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
+checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
new file mode 100644
index 000000000000..9eda4571cc33
--- /dev/null
+++ b/srcpkgs/pylint/patches/fix-tests.patch
@@ -0,0 +1,13 @@
+https://github.com/PyCQA/pylint/pull/4781
+
+--- a/tests/lint/unittest_lint.py
++++ b/tests/lint/unittest_lint.py
+@@ -643,7 +643,7 @@ def test_pylint_home():
+             assert config.PYLINT_HOME == pylintd
+         finally:
+             try:
+-                os.remove(pylintd)
++                rmtree(pylintd)
+             except FileNotFoundError:
+                 pass
+     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index e2c275d029dd..7b1b6e4fed21 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,34 +1,26 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.7.4
+version=2.9.6
 revision=1
-wrksrc="pylint-${version}"
 build_style=python3-module
+make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
-checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
+depends="python3-astroid python3-isort python3-mccabe python3-toml"
+checkdepends="$depends python3-pytest python3-tkinter python3-six"
 short_desc="Python code static checker"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
-homepage="http://www.pylint.org/"
+homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
-make_check=no
+distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
+checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
 
 post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
-
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
-
-	for f in man/*; do
-		vman "$f"
-	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
deleted file mode 100644
index 9521dab29d9b..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -51,14 +51,9 @@
- 
- testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
- os.chdir(testroot)
--if sys.version_info >= (3, 0):
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
--                                                     '..', 'build', 'lib')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
--                                                  'build', 'lib', 'extras')))
--else:
--    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
--    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
-+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
-+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
-+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
- sys.path.insert(0, testroot)
- 
- try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
deleted file mode 100644
index 02232f31a266..000000000000
--- a/srcpkgs/python-docutils/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'python-docutils'
-pkgname=python-docutils
-version=0.16
-revision=3
-wrksrc="docutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python python-Pygments"
-short_desc="Python2 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
-checkdepends+="$depends python3-Pygments"
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2
- docutils:rst2html4:/usr/bin/rst2html4.py2
- docutils:rst2html5:/usr/bin/rst2html5.py2
- docutils:rst2latex:/usr/bin/rst2latex.py2
- docutils:rst2man:/usr/bin/rst2man.py2
- docutils:rst2odt:/usr/bin/rst2odt.py2
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
- docutils:rst2s5:/usr/bin/rst2s5.py2
- docutils:rst2xetex:/usr/bin/rst2xetex.py2
- docutils:rst2xml:/usr/bin/rst2xml.py2
- docutils:rstpep2html:/usr/bin/rstpep2html.py2"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
-
-python3-docutils_package() {
-	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3
-	 docutils:rst2html4:/usr/bin/rst2html4.py3
-	 docutils:rst2html5:/usr/bin/rst2html5.py3
-	 docutils:rst2latex:/usr/bin/rst2latex.py3
-	 docutils:rst2man:/usr/bin/rst2man.py3
-	 docutils:rst2odt:/usr/bin/rst2odt.py3
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
-	 docutils:rst2s5:/usr/bin/rst2s5.py3
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
-	 docutils:rst2xml:/usr/bin/rst2xml.py3
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
-	depends="python3 python3-Pygments"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense COPYING.txt COPYING
-	}
-}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e3a8b722d3d7..ee3eb96ffd5b 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.9.0
+version=2.10.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
+checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
new file mode 100644
index 000000000000..204eba16181f
--- /dev/null
+++ b/srcpkgs/python3-RPi.GPIO/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-RPi.GPIO'
+pkgname=python3-RPi.GPIO
+version=0.7.0
+revision=1
+archs="armv[67]l* aarch64*"
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Module to control Raspberry Pi GPIO channels"
+maintainer="amak <amak.git@outlook.com>"
+license="MIT"
+homepage="https://sourceforge.net/projects/raspberry-gpio-python"
+distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
+checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
+
+# needed for gcc 10
+# fixed upstream in commit 8a0a65
+CFLAGS="-fcommon"
+
+post_install() {
+	vlicense LICENCE.txt
+}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index 90337771ace5..ff8b0aa36fb4 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=1.3.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
+version=2.0.0
+revision=1
+wrksrc="aioredis-py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-hiredis"
+depends="python3-async-timeout python3-typing_extensions python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
+checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
+# checks require a locally running redis server
+make_check="no"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 6609672c134d..bec1109131d8 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
-# Tests require unpackaged "trustme"
+checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
+# Tests not supported
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index a8fb9a7017fc..4c9f405e5f9e 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,18 +1,16 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.5.3
+version=2.6.5
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-lazy-object-proxy python3-wrapt
- python3-typed-ast"
-checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
- python3-py python3-pluggy python3-more-itertools python3-parsing"
+depends="python3-lazy-object-proxy python3-wrapt"
+checkdepends="$depends python3-pytest python3-numpy"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
+distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
+checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 622d6e3f1b1c..efd5af32614a 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.104
+version=1.18.21
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
+checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index e060dd652118..179d770bbff5 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.1.3
-revision=2
+version=2.2.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
+checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 077fda2b81e1..1c73d2e4d95b 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.5.0
-revision=2
+version=1.6.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
+checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
deleted file mode 120000
index 8876054b3b55..000000000000
--- a/srcpkgs/python3-docutils
+++ /dev/null
@@ -1 +0,0 @@
-python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
new file mode 100644
index 000000000000..6ffd111a0a12
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-docutils'
+pkgname=python3-docutils
+version=0.17.1
+revision=1
+wrksrc="docutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python3-Pygments"
+checkdepends="${depends}"
+short_desc="Python3 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py
+ docutils:rst2html4:/usr/bin/rst2html4.py
+ docutils:rst2html5:/usr/bin/rst2html5.py
+ docutils:rst2latex:/usr/bin/rst2latex.py
+ docutils:rst2man:/usr/bin/rst2man.py
+ docutils:rst2odt:/usr/bin/rst2odt.py
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
+ docutils:rst2s5:/usr/bin/rst2s5.py
+ docutils:rst2xetex:/usr/bin/rst2xetex.py
+ docutils:rst2xml:/usr/bin/rst2xml.py
+ docutils:rstpep2html:/usr/bin/rstpep2html.py"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 4de38628f65d..1584394b2203 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.2
+version=2.2.3
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
+checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e2f665255b93..e13d6285244a 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.2.0
+version=3.3.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
+checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 8c7ca89135aa..b749c3f698d6 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.25.0
+version=7.26.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
+checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index 93e359df6d13..ccf9ed82f29a 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.5
+version=0.9.6
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
+checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index e522350de61f..563bb01d2e57 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.8.0
+version=1.10.1
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
+checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index b02f650fb8db..469924e5f875 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
+checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index a921ee641a95..e001f16e7748 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.0
+version=3.1
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
+checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index dd5492a8dd5c..4a354ae02cca 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
+checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 4729c0e8e2d7..0333827d3db9 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.1
+version=1.21.2
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
+checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 130b54166f75..f5d9a5200dc4 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
+checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 9ef65d48341a..cffad7a5c60c 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.15.0
+version=2.16.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
+checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index d6d446b21572..143e2a05e262 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,6 +1,7 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -70,8 +70,6 @@
+@@ -67,9 +67,7 @@
+     },
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d9de3bb50c45..b19e0f830745 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.1
+version=21.2.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
+checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index f11318738e21..2aca6075eca8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.3
+version=0.16.4
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
+checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index c2c7a3539eba..2eb834eceae3 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
+checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
new file mode 100644
index 000000000000..85ba6e990544
--- /dev/null
+++ b/srcpkgs/python3-pypandoc/patches/no-pip.patch
@@ -0,0 +1,20 @@
+Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+===================================================================
+--- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
++++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
+1@ -1,3 +0,0 @@
+-setuptools
+-pip>=8.1.0
+-wheel>=0.25.0
+Index: pypandoc-1.6.3/setup.py
+===================================================================
+--- pypandoc-1.6.3.orig/setup.py
++++ pypandoc-1.6.3/setup.py
+@@ -87,7 +87,6 @@ setup(
+     author_email = 'bebraw@gmail.com',
+     packages = ['pypandoc'],
+     package_data={'pypandoc': ['files/*']},
+-    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
+     classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index de6fea26d07d..e131ccfa7da2 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.5
-revision=2
+version=1.6.3
+revision=1
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="$depends python3-pip texlive"
+checkdepends="pandoc texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
+checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index c278114af2c8..d5e33af8358f 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.17.3
-revision=2
+version=0.18.0
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
+checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
 
 post_install() {
-	vlicense LICENCE.mit LICENSE
+	vlicense LICENSE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 4046fa5055e1..f246e35c4115 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
+checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 9e992b779564..4ad868cbbde7 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,22 +1,18 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.1
-revision=3
+version=0.10.2
+revision=1
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
-checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
- python3-cryptography python3-dogpile.cache python3-future python3-jmespath
- python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
- python3-requests python3-stevedore python3-voluptuous python3-wcwidth
- python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
+checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
+make_check=no # unpackaged hacking, oslotest, stestr
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
new file mode 100644
index 000000000000..12afe88ffe07
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-httpserver'
+pkgname=python3-pytest-httpserver
+version=1.0.1
+revision=1
+wrksrc=pytest-httpserver-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest python3-Werkzeug"
+short_desc="HTTP server for pytest"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="MIT"
+homepage="https://www.github.com/csernazs/pytest-httpserver"
+changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
+distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
+checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 5a194723f83b..a9ecd429f467 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.7
+version=2021.2.8
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
+checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 03807afcc0ea..4b4bf8b44a15 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.1.0
+version=22.2.1
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
+checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index d4e7636810e9..5df229570956 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.7.6
+version=2021.8.3
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
+checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 9ed11b2ad473..58bda9b40ef1 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.0
+version=1.7.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
+checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index f541afcdfddf..130923b5e4ac 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.7.2
+version=2021.8.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
+checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 9d8af1e8bc05..28d48a351a5f 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.0.2
+version=4.1.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
+checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a87210ebe16a..da5a2b0c2b3c 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.2
-revision=5
+version=1.0.3
+revision=1
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-devel python3-urwid"
+hostmakedepends="python3-setuptools"
 depends="python3-urwid"
-short_desc="Tree widgets for urwid (Python3)"
+checkdepends="$depends python3-mock"
+short_desc="Tree widgets for urwid"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
+checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 8d155e15b600..580ba9fc33b6 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.1.1
-revision=2
+version=1.2.1
+revision=1
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
+checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index bc0bbc789b8f..9349b2260a67 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.3
+version=0.16.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
+checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index 3fe5bc6a6d54..a38571989276 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,8 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.19.0
+version=3.20.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +13,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
+checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
new file mode 100644
index 000000000000..610c93d8ca70
--- /dev/null
+++ b/srcpkgs/qalculate-qt/template
@@ -0,0 +1,16 @@
+# Template file for 'qalculate-qt'
+# NOTE: keep this package synchronized with "srcpkgs/qalculate"
+# and "srcpkgs/qalculate-gtk"
+pkgname=qalculate-qt
+version=3.20.1
+revision=1
+build_style=qmake
+hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
+makedepends="libqalculate-devel qt5-devel"
+depends="gnuplot"
+short_desc="Multi-purpose desktop calculator - QT version"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://qalculate.github.io"
+distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
+checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 6a2388c5cf4f..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,8 +1,9 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
+# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.19.0
-revision=1
+version=3.20.1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +14,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
+checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 6d5f8c082fa7..53cce4facf00 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.6
+version=4.3.7
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
+checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index 6c6349022253..c6325d0c962f 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=1
+revision=2
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="The QT frontend to Giac/Xcas"
+short_desc="QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 06dbf272cdd2..9a1fd3435db2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
+checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
-             m_adapterClient->loadFinished(false, request.url(), false,
-                                           net::ERR_DISALLOWED_URL_SCHEME,
-                                           QCoreApplication::translate("WebContentsAdapter",
--                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
--                                          false);
-+                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
-             return;
-         }
-         params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
- 
-     GURL dataUrlToLoad(urlString);
-     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
--        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
-         return;
-     }
-     content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
-     if (m_webContents->IsLoading()) {
-         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
-                                            QStringLiteral("Discarded"));
-+        m_webContentsDelegate->DidStopLoading();
-     }
- 
-     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
-     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
-     virtual void loadCommitted() = 0;
-     virtual void loadVisuallyCommitted() = 0;
--    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                              const QString &errorDescription, bool triggersErrorPage) = 0;
-+    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
-     virtual void focusContainer() = 0;
-     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
-     virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
- 
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
--    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
--    int p = qMin(qRound(progress * 100), 100);
--
--    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
-+    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
-         return;
- 
--    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
--        m_loadProgressMap[current_url] = p;
-+    int p = qMin(qRound(progress * 100), 100);
-+    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+        m_loadingInfo.progress = p;
-         m_viewClient->loadProgressChanged(p);
-     }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
-     }
- }
- 
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
--    m_isDocumentEmpty = true;
--    m_viewClient->loadStarted(url, isErrorPage);
--    m_viewClient->updateNavigationActions();
--
--    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
--        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
--        && !m_isNavigationCommitted) {
--        m_loadProgressMap.insert(url, 100);
--        m_lastLoadedUrl = url;
--        m_viewClient->loadProgressChanged(100);
-+    // only report first ever load start or separate one for error page only
-+    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
-         return;
--    }
- 
--    if (!m_loadProgressMap.isEmpty()) {
--        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
--        while (it != m_loadProgressMap.end()) {
--            if (it.value() == 100) {
--                it = m_loadProgressMap.erase(it);
--                continue;
--            }
--            ++it;
--        }
-+    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+    if (!isErrorPage) {
-+        m_loadingInfo.progress = 0;
-+        m_viewClient->loadStarted(m_loadingInfo.url, false);
-+        m_viewClient->updateNavigationActions();
-+        m_viewClient->loadProgressChanged(0);
-+    } else {
-+        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-     }
--
--    m_lastLoadedUrl = url;
--    m_loadProgressMap.insert(url, 0);
--    m_viewClient->loadProgressChanged(0);
- }
- 
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
-     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
-         navigation_handle->SetSilentlyIgnoreErrors();
- 
--    if (!navigation_handle->IsInMainFrame())
-+    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
-         return;
- 
- 
-     m_loadingErrorFrameList.clear();
-     m_faviconManager->resetCandidates();
--    EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+    m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+    emitLoadStarted(isErrorPage);
- }
- 
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
--    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
--    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
--    // When error page enabled we don't need to send the error page load finished signal
--    if (m_loadProgressMap[url] == 100)
-+    if (!m_loadingInfo.isLoading()) // not currently running
-         return;
- 
--    m_lastLoadedUrl = url;
--    m_loadProgressMap[url] = 100;
--    m_isNavigationCommitted = false;
--    m_viewClient->loadProgressChanged(100);
-+    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+    if (!isErrorPage) {
-+        if (m_loadingInfo.progress < 100) {
-+            m_loadingInfo.progress = 100;
-+            m_viewClient->loadProgressChanged(100);
-+        }
- 
--    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
--    m_viewClient->updateNavigationActions();
-+        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+        m_viewClient->updateNavigationActions();
-+    } else {
-+        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+    }
- }
- 
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
-     m_findTextHelper->handleLoadCommitted();
-     m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-                 profileAdapter->visitedLinksManager()->addUrl(url);
-         }
- 
--        m_isNavigationCommitted = true;
--        EmitLoadCommitted();
-+        emitLoadCommitted();
-     }
- 
-     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
-         // Now report we are starting to load an error-page.
-         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
-         m_faviconManager->resetCandidates();
--        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+        emitLoadStarted(true);
- 
-         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
-         if (navigation_handle->HasCommitted())
--            EmitLoadCommitted();
-+            emitLoadCommitted();
-     }
- }
- 
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
- 
-     if (m_loadingState == LoadingState::Loading)
-         setLoadingState(LoadingState::Loaded);
-+
-+    emitLoadFinished();
-+    m_loadingInfo.clear();
- }
- 
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
-     // Delay notifying failure until the error-page is done loading.
-     // Error-pages are not loaded on failures due to abort.
-     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
--    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+    m_loadingInfo.success = false;
-+    m_loadingInfo.url = url;
-+    m_loadingInfo.errorCode = errorCode;
-+    m_loadingInfo.errorDescription = errorDescription;
-+    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
- 
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
-         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
-         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
-         m_viewClient->iconChanged(QUrl());
--
--        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+        emitLoadFinished(/* isErrorPage = */true);
-         return;
-     }
-     // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-         // Trigger LoadFinished signal for main frame's error page only.
-         if (!render_frame_host->GetParent()) {
-             m_viewClient->iconChanged(QUrl());
--            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+            emitLoadFinished(/* isErrorPage = */true);
-         }
- 
-         return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
-     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
-     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
-     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
--    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+    m_loadingInfo.success = http_statuscode < 400;
-+    m_loadingInfo.url = toQt(validated_url);
-+    m_loadingInfo.errorCode = http_statuscode;
-+    m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
- 
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
-                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
-                  const QUrl &url,
-                  bool user_gesture);
--    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
--    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
--    void EmitLoadCommitted();
-+    void emitLoadStarted(bool isErrorPage = false);
-+    void emitLoadFinished(bool isErrorPage = false);
-+    void emitLoadCommitted();
- 
-     LoadingState determineLoadingState(content::WebContents *contents);
-     void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
-     int m_desktopStreamCount = 0;
-     mutable bool m_pendingUrlUpdate = false;
- 
--    QMap<QUrl, int> m_loadProgressMap;
--    QUrl m_lastLoadedUrl;
--    bool m_isNavigationCommitted = false;
-+    struct LoadingInfo {
-+        bool success = false;
-+        int progress = -1;
-+        bool isLoading() const { return progress >= 0; }
-+        QUrl url;
-+        int errorCode = 0;
-+        QString errorDescription;
-+        bool triggersErrorPage = false;
-+        void clear() { *this = LoadingInfo(); }
-+    } m_loadingInfo;
-+
-     bool m_isDocumentEmpty = true;
-     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
- 
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                              const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QQuickWebEngineView);
--    Q_UNUSED(triggersErrorPage);
- 
-     if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override;
-     void loadVisuallyCommitted() override;
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
-     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
- 
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                                         const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
-     Q_Q(QWebEnginePage);
-     Q_UNUSED(url);
-     Q_UNUSED(errorCode);
-     Q_UNUSED(errorDescription);
- 
--    if (isErrorPage) {
--        QTimer::singleShot(0, q, [q](){
--            emit q->loadFinished(false);
--        });
-+    if (isErrorPage)
-         return;
--    }
- 
-     isLoading = false;
--    Q_ASSERT((success && !triggersErrorPage) || !success);
--    if (!triggersErrorPage) {
--        QTimer::singleShot(0, q, [q, success](){
--            emit q->loadFinished(success);
--        });
--    }
-+    QTimer::singleShot(0, q, [q, success](){
-+        emit q->loadFinished(success);
-+    });
- }
- 
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
-     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
-     void loadCommitted() override { }
-     void loadVisuallyCommitted() override { }
--    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
--                      const QString &errorDescription, bool triggersErrorPage) override;
-+    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
-     void focusContainer() override;
-     void unhandledKeyEvent(QKeyEvent *event) override;
-     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
- 
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+ 
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+ 
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+        ucnv_setFallback(m_converterICU, TRUE);
+                                         ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+            isAccessible = TRUE;
+                           ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+            isAccessible = FALSE;
+                           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+            return TRUE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+            return FALSE;
+                   ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+        return FALSE;
+               ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+    return TRUE;
+           ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=11
+revision=12
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..e7d329e74338 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
deleted file mode 100644
index ec8a74660e0d..000000000000
--- a/srcpkgs/qt5ct/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 3cd4cf713430..69d06e92481b 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.2
-revision=1
+version=1.3
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
+checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..0b3dd492fb1f 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,6 +32,7 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 74eb24de1628..65e7a63a596c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
+checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 7d3ae4effa4b..ba66ebb1b62d 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.0
+version=2.3.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
+checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index 882547d3f3c5..f994982e0dfb 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,12 +1,14 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
+checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
+changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
+checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4a0c532cad2..6c774757a5da 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=46
+revision=50
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,6 +21,7 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -68,10 +69,12 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
+ gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
+ gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -179,6 +182,10 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
+ ImageMagick6<=6.9.12.12_2
+ libmagick6<=6.9.12.12_2
+ libmagick6-devel<=6.9.12.12_2
+ libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -218,6 +225,7 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
+ onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -228,10 +236,13 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
+ psiconv<=0.9.9_9
+ ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
+ python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -317,6 +328,8 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
+ libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index a0d55c41cae9..90f1e689db15 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
+checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index c708e079b674..700c74249316 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=1
+revision=2
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan 'vulkan-loader')"
+depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,29 +27,32 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
 
+desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
+vopt_conflict glcore gles2 # gles2 disables glcore support
+
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_opengl" ]; then
+if [ "$build_option_glcore" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -67,8 +70,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -77,8 +80,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
new file mode 100644
index 000000000000..756744d1a951
--- /dev/null
+++ b/srcpkgs/ripright/patches/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
+-PKG_CHECK_MODULES([MagickWand], [Wand])
++PKG_CHECK_MODULES([MagickWand], [MagickWand])
+ PKG_CHECK_MODULES([libcurl], [libcurl])
+ PKG_CHECK_MODULES([libdiscid], [libdiscid])
+ AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
+--- a/src/art.c
++++ b/src/art.c
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index d44f96166e18..fcdec80435b4 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,13 +1,17 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=2
+revision=3
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config autoconf automake"
+makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="http://www.mcternan.me.uk/ripright/"
-distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="https://www.mcternan.me.uk/ripright/"
+distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
+
+pre_configure() {
+	autoreconf -fi
+}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index e48f0312e162..1566aac51f5a 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
-checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
+checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 8067f5d7ab7f..81a8c484d0a3 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,16 +1,23 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
+# official Raspbian distribution. This is currently 5.10:
 #
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+#
+# Commit hash is picked from latest tag [1], if appropriate, or from latest
+# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
+#
+# [1] https://github.com/raspberrypi/linux/releases
+#
+# WARNING: keep all rpi*-kernel packages in sync
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +27,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +148,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +158,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cda240234550..cc861a0a261a 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi2-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -141,7 +137,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +147,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index a3a16bc577fc..0dd5ce9593db 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,16 +1,12 @@
 # Template file for 'rpi3-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.4.83
-revision=2
+version=5.10.52
+revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -144,7 +140,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -154,7 +150,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 04fbb7d64bb4..9ddae3fac5a3 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,15 +1,11 @@
 # Template file for 'rpi4-kernel'
-#
-# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.4:
-#
-#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
+# See rpi-kernel for version policy
 
-_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
+_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.4.83
+version=5.10.52
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -20,7 +16,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
+checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
 python_version=3
 conflicts=rpi3-kernel
 
@@ -145,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -155,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
+		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=5
+revision=6
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
deleted file mode 100644
index 45e8be341e53..000000000000
--- a/srcpkgs/rustup/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 294f5b020a08..44d9a4993329 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=1
+revision=2
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 7ec0a5f572bb..195fc1eb9cde 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.15
-revision=3
+version=0.5.16
+revision=1
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
+checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 708abb75f5d2..bef14573ec5b 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.31.0
+version=2.32.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
+checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0921a40dba22..4bd23c7bdd0d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.6
+version=2.1.7
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
+checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
+	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 638d0cc797ad..2c7a468c33c6 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,13 +1,14 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
+ lua51-devel ncurses-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index fe8ae3006c5a..7565f4303e7e 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive"
-makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
+hostmakedepends="automake autoconf-archive pkg-config"
+makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
+checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 4220c71bc897..25dc389f8fcc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
+checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index a0778f3afafb..64b34e431eda 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
+checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index 6005911c87e4..a36107372bd9 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
+checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index d9e55ffb62bb..676dc2884df6 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=0.9.24
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
+checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index bb9401729c71..e01809732949 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=0.9.12
+version=1.0
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
+checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
new file mode 100644
index 000000000000..fda2729bd65c
--- /dev/null
+++ b/srcpkgs/sftpgo/template
@@ -0,0 +1,16 @@
+# Template file for 'sftpgo'
+pkgname=sftpgo
+version=2.1.0
+revision=1
+build_style=go
+go_import_path=github.com/drakkan/sftpgo
+short_desc="Fully featured and highly configurable SFTP server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="AGPL-3.0"
+homepage="https://github.com/drakkan/sftpgo"
+distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
+checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index f465792f603b..a4e953367ced 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.0
+version=3.3.1
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
+checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
new file mode 100644
index 000000000000..0cd56601f58d
--- /dev/null
+++ b/srcpkgs/shiori/files/shiori/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
new file mode 100644
index 000000000000..9a7ec9528226
--- /dev/null
+++ b/srcpkgs/shiori/template
@@ -0,0 +1,23 @@
+# Template file for 'shiori'
+pkgname=shiori
+version=1.5.0
+revision=1
+build_style=go
+go_import_path=github.com/go-shiori/shiori
+short_desc="Simple bookmark manager built with Go"
+maintainer="Frank Steinborn <steinex@nognu.de>"
+license="MIT"
+homepage="https://github.com/go-shiori/shiori"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
+
+system_accounts="_shiori"
+_shiori_homedir="/var/lib/shiori"
+_shiori_descr="shiori bookmark manager"
+
+make_dirs="/var/lib/shiori 0700 _shiori _shiori"
+
+post_install() {
+	vsv shiori
+	vlicense LICENSE
+}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5ad51345b231..d0e7d67586f9 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel x264-devel"
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
+ x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index a9c2820763a3..3b1d7dec047a 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
+checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 9b6187c0e978..c83932189c32 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
+checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 2aa5a5cc4fe5..1a8823ce246f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.0
+version=6.1.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
+checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 5c975d99ff39..84c1cf6053d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.28.1
+version=1.30.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
+checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 07284734b107..769b8d1cdda3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
+checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 3aede5163710..359884d67c58 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.73.0.129
+version=8.75.0.140
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
+checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 03dddc195145..bdbd6bb2effd 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.17.0
+version=4.18.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
+checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index f7d3ebf142f5..d95af662dcc0 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.10.2
+version=4.11.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
+checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index 564da633cc17..fc711bec335d 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.1.0
-revision=2
+version=21.8.0
+revision=1
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
+checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
 
 export QT_SELECT=5
 
 pre_build() {
-	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
new file mode 100644
index 000000000000..4dbb89061bee
--- /dev/null
+++ b/srcpkgs/snowball/patches/libstemmer-library.patch
@@ -0,0 +1,33 @@
+based on alpine patches which are based on gentoo patches
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -165,7 +165,7 @@
+ CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -212,6 +212,9 @@
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
new file mode 100644
index 000000000000..784d281e1453
--- /dev/null
+++ b/srcpkgs/snowball/template
@@ -0,0 +1,60 @@
+# Template file for 'snowball'
+pkgname=snowball
+version=2.1.0
+revision=1
+build_style=gnu-makefile
+build_helper=qemu
+make_check_target=check_stemtest # other checks are missing targets in the makefile
+hostmakedepends="perl"
+short_desc="Small string processing language for creating stemming algorithms"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://snowballstem.org/"
+distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
+checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
+
+post_patch() {
+	if [ -n "$CROSS_BUILD" ]; then
+		vsed -i GNUmakefile \
+			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
+	fi
+}
+
+do_install() {
+	vbin snowball
+	vbin stemwords
+
+	vinstall include/libstemmer.h 644 usr/include
+	vinstall libstemmer.so.$version 644 usr/lib
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
+	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
+
+	# the static library has .o suffix
+	# https://github.com/snowballstem/snowball/pull/150
+	vinstall libstemmer.o 644 usr/lib libstemmer.a
+
+	vlicense COPYING
+}
+
+# XXX: upstream doesn't generate a dynamic library for libstemmer
+# each distribution patches this on their own:
+# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
+# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
+# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
+
+libstemmer_package() {
+	short_desc="Stemming algorithm library"
+	pkg_install() {
+		vmove "usr/lib/libstemmer.so.*"
+	}
+}
+
+libstemmer-devel_package() {
+	depends="libstemmer>=${version}_${revision}"
+	short_desc="Stemming algorithm library - development files"
+	pkg_install() {
+		vmove usr/lib/libstemmer.a
+		vmove usr/lib/libstemmer.so
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 96720d648ede..4ded1d1c9281 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
+checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index df6c91a6878a..f60caae87d75 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.13
+version=3.14
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="GPL-3.0-or-later"
+license="CC-BY-3.0"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
+checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 6738f97b34de..e8d19a55043b 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
+checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
new file mode 100644
index 000000000000..7f6e063e34e0
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
@@ -0,0 +1,14 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -26,11 +26,6 @@
+ # Version macros
+ target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
+ 
+-# Check if using GCC for crash handler support
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
+-endif ()
+-
+ # Link optional libraries
+ if (LIB_QT_LIBRARIES)
+ 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index c9af2988c3d9..af3179dd2b91 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.6
+version=3.7
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
+checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a0645646d0f6..b20c8cfc3ecc 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.7
+version=1.5.8
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
+checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
new file mode 100644
index 000000000000..837e9c28249b
--- /dev/null
+++ b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
@@ -0,0 +1,712 @@
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: fix for libconfig 1.7.3
+
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 2fd0eaf..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -48,6 +48,18 @@
+ /* This gets included in the output .c file */
+ 
+ 
++/* Libconfig 1.4.9 is still used by major distributions
++ * (e.g. CentOS7) and had a different name for
++ * config_setting_lookup */
++#if LIBCONFIG_VER_MAJOR == 1
++#if LIBCONFIG_VER_MINOR == 4
++#if LIBCONFIG_VER_REVISION == 9
++#define config_setting_lookup config_lookup_from
++#endif
++#endif
++#endif
++
++
+ /* config_type, lookup_fns, type2str are related, keep them together */
+ typedef enum {
+     CFG_BOOL,
+@@ -114,6 +126,14 @@ typedef int config_t;
+         return 0; \
+     }
+ 
++enum {
++    CONFIG_TYPE_INT,
++    CONFIG_TYPE_BOOL,
++    CONFIG_TYPE_INT64,
++    CONFIG_TYPE_FLOAT,
++    CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
+ 
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+ 
++config_setting_t* config_root_setting(config_t* c) {
++    return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+     return NULL;
+ }
+@@ -134,10 +158,38 @@ void config_init(config_t* c) {
+     return;
+ }
+ 
++char* config_setting_name(config_setting_t* c) {
++    return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++    return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++    return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+     return NULL;
+ }
+ 
++int config_setting_remove(config_setting_t* cfg, char* name) {
++    return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++    return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+     return 0;
+ }
+@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
+ }
+ #endif
+ 
++/* This is the same as config_setting_lookup_string() except
++it allocates a new string which belongs to the caller */
++static int myconfig_setting_lookup_stringcpy(
++        const config_setting_t* setting, 
++        const char* name, 
++        char** value)
++{
++    const char* str;
++    *value = NULL;
++    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
++        asprintf(value, "%s", str);
++        return CONFIG_TRUE;
++    } else {
++        return CONFIG_FALSE;
++    }
++}
++
+ typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+ lookup_fn lookup_fns[] = {
+     (lookup_fn)config_setting_lookup_bool,
+     (lookup_fn)config_setting_lookup_int,
+     (lookup_fn)config_setting_lookup_int64,
+     (lookup_fn)config_setting_lookup_float,
+-    (lookup_fn)config_setting_lookup_string,
++    (lookup_fn)myconfig_setting_lookup_stringcpy,
+     NULL,  /* CFG_GROUP */
+     NULL,  /* CFG_ARRAY */
+     NULL,  /* CFG_LIST */
+@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
+  struct arg_str* sslhcfg_chroot;
+  struct arg_str* sslhcfg_syslog_facility;
+  struct arg_str* sslhcfg_on_timeout;
++ struct arg_str* sslhcfg_prefix;
+  	struct arg_str* sslhcfg_listen;
+  	struct arg_str* sslhcfg_ssh;
+  	struct arg_str* sslhcfg_tls;
+@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
+  	struct arg_str* sslhcfg_anyprot;
+  struct arg_end* sslhcfg_end;
+ 
+-                                                                                                                    
++                                                                                                                                      
+ static struct config_desc table_sslhcfg_protocols[] = {
+ 
+ 
+@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "fork", 
+             /* type */          CFG_BOOL, 
+@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
+             /* default_val*/    .default_val.def_bool = 0 
+         },
+ 
++        { 
++            /* name */          "transparent", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "log_level", 
+             /* type */          CFG_INT, 
+@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
+         },
+ 	{ 0 }
+ };
+-                                    
++                                             
+ static struct config_desc table_sslhcfg_listen[] = {
+ 
+ 
+@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
+             /* default_val*/    .default_val.def_string = NULL 
+         },
+ 
++        { 
++            /* name */          "is_udp", 
++            /* type */          CFG_BOOL, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        NULL,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(int), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_bool = 0 
++        },
++
+         { 
+             /* name */          "keepalive", 
+             /* type */          CFG_BOOL, 
+@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
+         },
+ 	{ 0 }
+ };
+-                                                                                                    
++                                                                                                             
+ static struct config_desc table_sslhcfg[] = {
+ 
+ 
+@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
+             /* default_val*/    .default_val.def_string = "ssh" 
+         },
+ 
++        { 
++            /* name */          "prefix", 
++            /* type */          CFG_STRING, 
++            /* sub_group*/      NULL,
++            /* arg_cl */        & sslhcfg_prefix,
++            /* base_addr */     NULL,
++            /* offset */        offsetof(struct sslhcfg_item, prefix),
++            /* offset_len */    0,
++            /* offset_present */ 0,
++            /* size */          sizeof(char*), 
++            /* array_type */    -1,
++            /* mandatory */     0, 
++            /* optional */      0, 
++            /* default_val*/    .default_val.def_string = "" 
++        },
++
+         { 
+             /* name */          "listen", 
+             /* type */          CFG_LIST, 
+@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+-	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
+ 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
+ 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
+ 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
+-	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
+-	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
+ 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
++	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
++	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
+ 	{ 0 }
+ };
+ 
+@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: listen */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_listen,
+-            .base_entry =      & table_sslhcfg [11],
++            .base_entry =      & table_sslhcfg [12],
+             .targets =         sslhcfg_listen_targets,
+ 
+ 
+@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: ssh */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_ssh,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_ssh_targets,
+ 
+ 
+@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tls */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tls,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tls_targets,
+ 
+ 
+@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: openvpn */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_openvpn,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_openvpn_targets,
+ 
+ 
+@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: tinc */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_tinc,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_tinc_targets,
+ 
+ 
+@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: xmpp */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_xmpp,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_xmpp_targets,
+ 
+ 
+@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: http */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_http,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_http_targets,
+ 
+ 
+@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: adb */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_adb,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_adb_targets,
+ 
+ 
+@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: socks5 */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_socks5,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_socks5_targets,
+ 
+ 
+@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
+         {   /* arg: anyprot */
+             .regex =           "(.+):(\\w+)",
+             .arg_cl =          & sslhcfg_anyprot,
+-            .base_entry =      & table_sslhcfg [12],
++            .base_entry =      & table_sslhcfg [13],
+             .targets =         sslhcfg_anyprot_targets,
+ 
+ 
+@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
+ 
+ /* Changes all dashes to underscores in a string of
+ * vice-versa */
+-void strswap_ud(const char target, char* str)
++static void strswap_ud(const char target, char* str)
+ {
+     char* c;
+     for (c = str; *c; c++)
+@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
+ 
+ /* Same as config_setting_lookup() but looks up with dash or
+ * underscore so `my_setting` and `my-setting` match the same */
+-config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
++static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
+ {
+     config_setting_t* setting;
+     char name[strlen(desc->name)+1];;
+@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
+     return setting;
+ }
+ 
+-int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
++static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
+ {
+     lookup_fn lookup_fn = lookup_fns[desc->type];
+     char name[strlen(desc->name)+1];;
+@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
+     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
+ }
+ 
++/* Removes a setting, trying both underscores and dashes as
++* name (so deleting 'my-setting' deletes both 'my_setting'
++* and 'my-setting') */
++static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
++{
++    char name[strlen(desc->name)+1];;
++    strcpy(name, desc->name);
++
++    strswap_ud('_', name);
++    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
++        return CONFIG_TRUE;
++
++    strswap_ud('-', name);
++    return config_setting_remove(cfg, name);
++}
++
+ /* When traversing configuration, allocate memory for plural
+ * types, init for scalars */
+ static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
+@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
+                 TRACE_READ(("[%d] = ", i));
+                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
+             }
++            setting_delete_ud(cfg, desc);
+         }
+         break;
+ 
+@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
+                 return 0;
+             }
+             print_setting(desc->type, (((char*)target) + desc->offset));
++            setting_delete_ud(cfg, desc);
+             in_cfg = 1;
+         } else {
+             TRACE_READ((" not in config file"));
+@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
+     return 1;
+ }
+ 
++/* Allocates a new string that represents the setting value, which must be a scalar */
++static void scalar_to_string(char** strp, config_setting_t* s)
++{
++    switch(config_setting_type(s)) {
++    case CONFIG_TYPE_INT:
++        asprintf(strp, "%d\n", config_setting_get_int(s));
++        break;
++
++    case CONFIG_TYPE_BOOL:
++        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
++        break;
++
++    case CONFIG_TYPE_INT64:
++        asprintf(strp, "%lld\n", config_setting_get_int64(s));
++        break;
++
++    case CONFIG_TYPE_FLOAT:
++        asprintf(strp, "%lf\n", config_setting_get_float(s));
++        break;
++
++    case CONFIG_TYPE_STRING:
++        asprintf(strp, "%s\n", config_setting_get_string(s));
++        break;
++
++    default: /* This means a bug */
++        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
++        exit(1);
++    }
++}
++
++/* Typesets all the settings in a configuration as a
++* newly-allocated string. The string management is caller's
++* responsability. 
++* Returns the number of scalars in the configuration */
++static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
++{
++    int i, len, res = 0;
++    config_setting_t* child;
++    char* subpath, *value, *old;
++    const char* name;
++
++    len = config_setting_length(parent);
++    for (i = 0; i < len; i++) {
++        child = config_setting_get_elem(parent, i);
++        name = config_setting_name(child);
++        if (!name) name = "";
++
++        if(config_setting_is_list(parent) ||
++           config_setting_is_array(parent)) {
++            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
++        } else {
++            asprintf(&subpath, "%s/%s", path, name);
++        }
++
++        if (config_setting_is_scalar(child)) {
++            scalar_to_string(&value, child);
++
++            /* Add value to the output string  */
++            if (*strp) {
++                asprintf(&old, "%s", *strp);
++                free(*strp);
++            }  else {
++                asprintf(&old, "%s", "");
++            }
++            asprintf(strp, "%s%s:%s", old, subpath, value);
++            free(value);
++            free(old);
++
++            res++; /* At least one scalar was found */
++        } else {
++            /* It's an aggregate -- descend into it */
++            res += cfg_as_string(child, subpath, strp);
++        }
++
++        free(subpath);
++    }
++    return res;
++}
++
++
+ /* 0: success
+    <0: error */
+ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
+          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
+          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
++         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
+  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
+  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
+  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
+@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ 
+ 
+     config_init(&c);
+-    if (sslhcfg_conffile->count) {
++    if (sslhcfg_conffile && sslhcfg_conffile->count) {
+         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
+             fprintf(stderr, "%s\n", errmsg);
+             return -1;
+         }
+     }
+ 
+-    s = config_lookup(&c, "/");
++    s = config_root_setting(&c);
+ 
+     res = read_block(s, cfg, table_sslhcfg, &errmsg);
+     if (!res) {
+@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+         return -1;
+     }
+ 
++    errmsg = NULL;
++    res = cfg_as_string(s, "", &errmsg);
++    if (res)
++        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
++
+     return 0;
+ }
+ 
+@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
+             fprintf(out, " <unset>");
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
+         fprintf(out, "\n");
+         indent(out, depth);
+         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
+         fprintf(out, "\n");
+         indent(out, depth);
+@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
+         fprintf(out, "port: %s", sslhcfg_listen->port);
+         fprintf(out, "\n");
+         indent(out, depth);
++        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
++        fprintf(out, "\n");
++        indent(out, depth);
+         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
+         fprintf(out, "\n");
+ }
+@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
+         indent(out, depth);
+         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
+         fprintf(out, "\n");
++        indent(out, depth);
++        fprintf(out, "prefix: %s", sslhcfg->prefix);
++        fprintf(out, "\n");
+ 
+         indent(out, depth);
+         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
+diff --git a/sslh-conf.h b/sslh-conf.h
+index 9f48cf7..fbcc1c6 100644
+--- a/sslh-conf.h
++++ b/sslh-conf.h
+@@ -1,5 +1,5 @@
+ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
+- * on Wed Jul 29 22:51:16 2020. 
++ * on Wed Jun 23 11:46:45 2021. 
+ 
+ # conf2struct: generate libconf parsers that read to structs
+ # Copyright (C) 2018-2019  Yves Rutschle
+@@ -43,6 +43,7 @@
+ struct sslhcfg_listen_item {
+ 	char*	host;
+ 	char*	port;
++	int	is_udp;
+ 	int	keepalive;
+ };
+ 
+@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
+ 	char*	port;
+ 	int	service_is_present;
+ 	char*	service;
++	int	is_udp;
+ 	int	fork;
+ 	int	tfo_ok;
++	int	transparent;
+ 	int	log_level;
+ 	int	keepalive;
+ 	size_t	sni_hostnames_len;
+@@ -84,6 +87,7 @@ struct sslhcfg_item {
+ 	char*	chroot;
+ 	char*	syslog_facility;
+ 	char*	on_timeout;
++	char*	prefix;
+ 	size_t	listen_len;
+ 	struct sslhcfg_listen_item* listen;
+ 	size_t	protocols_len;
+diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index 55b6b53cee66..c2862bf62014 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index ee52d60d001e..70f0c1cc44f6 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,20 +1,15 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.10.1a
-revision=3
+version=0.12.2a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
- python3-urwidtrees python3-xdg"
-pycompile_module="stig"
+depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
+ python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
-
-post_extract() {
-	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
-}
+checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+make_check=no # needs python3-asynctest which is not packaged
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 117a1cc98219..1408f4073099 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.12
-revision=2
+version=5.13
+revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
+checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 0fa557e120a4..21dc3307c8b7 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.137
+version=4.4.142
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
+checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
- c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
+ 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
+ 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 0d4f3b18bcce..6ce5d88bafd2 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.12
+version=0.13.00
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
+checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index d730ab75c608..fadb4a57a37e 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2056
+version=2059
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
+checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 38acb380fec7..b615e585077b 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
+checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index 05fbe2b42f21..d7d2d92e609f 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
+distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
+checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e6286f96998b..7933f31a4358 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.38.0
+version=1.40.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
+checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index e8041622c0ea..9cbb2273b8a5 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
+checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 77f5a521da2c..89799db1f733 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
+checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 87907bbcda50..2c9892a79b77 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
+checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
deleted file mode 100644
index 4d99d6bc3f32..000000000000
--- a/srcpkgs/sysprof/patches/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/libsysprof-capture/sysprof-capture-condition.c
-+++ b/src/libsysprof-capture/sysprof-capture-condition.c
-@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
-     }
- 
-   sysprof_assert_not_reached ();
-+  return NULL;
- }
- 
- static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
deleted file mode 100644
index abaac692fb37..000000000000
--- a/srcpkgs/sysprof/patches/musl.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 6 Sep 2020 18:21:37 +0200
-Subject: [PATCH] fix build on musl
-
----
- .../sysprof-capture-cursor.c                  |  1 +
- .../sysprof-capture-reader.c                  |  1 +
- src/libsysprof-capture/sysprof-capture-util.c |  1 +
- .../sysprof-capture-writer-cat.c              |  1 +
- src/libsysprof-capture/sysprof-collector.c    |  1 +
- src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
- src/libsysprof-capture/sysprof-platform.c     |  1 +
- 7 files changed, 34 insertions(+)
- create mode 100644 src/libsysprof-capture/sysprof-compat.h
-
-diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
-index 24563f0..bb77a60 100644
---- a/src/libsysprof-capture/sysprof-capture-cursor.c
-+++ b/src/libsysprof-capture/sysprof-capture-cursor.c
-@@ -59,6 +59,7 @@
- #include <assert.h>
- #include <stdlib.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-condition.h"
- #include "sysprof-capture-cursor.h"
- #include "sysprof-capture-reader.h"
-diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
-index 67c6b28..252d006 100644
---- a/src/libsysprof-capture/sysprof-capture-reader.c
-+++ b/src/libsysprof-capture/sysprof-capture-reader.c
-@@ -68,6 +68,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-reader.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-capture-writer.h"
-diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
-index 0bbea06..0e5f7e7 100644
---- a/src/libsysprof-capture/sysprof-capture-util.c
-+++ b/src/libsysprof-capture/sysprof-capture-util.c
-@@ -56,6 +56,7 @@
- 
- #include "config.h"
- 
-+#include <stdint.h>
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
-index 66171b9..9febbbb 100644
---- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
-+++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
-@@ -63,6 +63,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture.h"
- #include "sysprof-macros-internal.h"
- 
-diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
-index 1d7a0d6..7af6c96 100644
---- a/src/libsysprof-capture/sysprof-collector.c
-+++ b/src/libsysprof-capture/sysprof-collector.c
-@@ -73,6 +73,7 @@
- 
- #include "mapped-ring-buffer.h"
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-collector.h"
- #include "sysprof-macros-internal.h"
-diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
-new file mode 100644
-index 0000000..ae9bf10
---- /dev/null
-+++ b/src/libsysprof-capture/sysprof-compat.h
-@@ -0,0 +1,28 @@
-+/* added by q66 @ void to fix build on musl */
-+
-+#pragma once
-+
-+#ifndef __GLIBC__
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+/* from glibc */
-+#ifndef TEMP_FAILURE_RETRY
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-+    if (sz && (nmemb > ((size_t)-1 / sz))) {
-+        errno = ENOMEM;
-+        return NULL;
-+    }
-+    return realloc(p, nmemb * sz);
-+}
-+
-+#endif
-diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
-index a80ab89..05bd590 100644
---- a/src/libsysprof-capture/sysprof-platform.c
-+++ b/src/libsysprof-capture/sysprof-platform.c
-@@ -60,6 +60,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include "sysprof-compat.h"
- #include "sysprof-capture-util-private.h"
- #include "sysprof-platform.h"
- 
--- 
-2.28.0
-
-From here onward, blame sgn
-Index: meson.build
-===================================================================
---- a/meson.build
-+++ b/meson.build
-@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
- config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
- 
- config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
-+config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
- 
- if get_option('libunwind')
-   libunwind_dep = dependency('libunwind-generic', required: false)
-Index: src/libsysprof-capture/sysprof-compat.h
-===================================================================
---- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
-+++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
-@@ -17,6 +17,7 @@
-        __result; }))
- #endif
- 
-+#ifndef HAVE_REALLOCARRAY
- static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
-     if (sz && (nmemb > ((size_t)-1 / sz))) {
-         errno = ENOMEM;
-@@ -24,5 +25,5 @@
-     }
-     return realloc(p, nmemb * sz);
- }
--
-+#endif
- #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index eae51ea7356b..2e24cd7de548 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,27 +1,23 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.38.0
+version=3.40.1
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="http://sysprof.com/"
+homepage="https://gitlab.gnome.org/GNOME/sysprof"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
+checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
-pre_build() {
-	export SHELL=/bin/bash
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 3bbaac521054..28975e3f28d1 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
+checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 5c7710874355..9e99e7feb0d2 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.1
+version=3.4.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
+checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 74f1aeeb429f..bc7d37bdd1eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.0.1
+version=10.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
+checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 598429ea085e..e715ba313352 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.10.0
+version=1.12.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
+checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
deleted file mode 100644
index 0bb89b65c7ff..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/desktop-app/lib_webview/pull/9
-
-From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
-From: Vitaly Lipatov <lav@altlinux.ru>
-Date: Fri, 9 Jul 2021 16:56:50 +0300
-Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
- in the included headers
-
----
- webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
-index 8d180c1..e894c75 100644
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,11 +6,9 @@
- //
- #pragma once
-
--extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
--} // extern "C"
-
- namespace Webview::WebkitGtk {
-
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ca30e932a5ad..3b5cd9fcdadf 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.10
+version=2.9.0
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
+checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 0e292cb03ed0..e076fa74c5e9 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
+checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 9ebaa2fc426d..672bc4f1e49b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.1
+version=0.31.4
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
+checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=4
+revision=5
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=9
+revision=10
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 95396e46d25e..9d7b80cd5418 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=1
+revision=2
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 29704030c8d5..3558008383b2 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.30
-revision=4
+version=3.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
+checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,12 +20,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-do_check() {
+pre_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
-
-	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index d1a872d7d31b..75a7fc0ce87d 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.4
+version=2.4.6
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
+checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 70818293a92a..ceea8393613f 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.84.0
+version=5.85.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
+checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a31df4b08f4..3a27d46b40b5 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.12.0
+version=78.13.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
- ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
- 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
- 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
- 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
- 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
- cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
- 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
- e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
- a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
- 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
- b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
- 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
- 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
- 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
- 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
- a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
- 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
- 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
- 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
- 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
- fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
- 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
- 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
- a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
- ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
- 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
- a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
- ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
- 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
- be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
- b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
- c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
- 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
- a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
- a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
- 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
- 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
- b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
- ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
- 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
- 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
- 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
- d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
- 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
- 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
- cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
- 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
- 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
- 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
- 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
- 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
- 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
- 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
- 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
+checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
+ 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
+ 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
+ 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
+ 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
+ ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
+ eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
+ e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
+ b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
+ a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
+ a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
+ 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
+ abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
+ 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
+ bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
+ 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
+ b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
+ b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
+ 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
+ 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
+ b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
+ 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
+ f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
+ 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
+ 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
+ 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
+ def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
+ a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
+ 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
+ c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
+ 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
+ f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
+ a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
+ d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
+ e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
+ ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
+ a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
+ df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
+ 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
+ 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
+ c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
+ 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
+ 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
+ bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
+ 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
+ d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
+ 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
+ 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
+ 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
+ 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
+ d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
+ f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
+ 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
+ d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
+ a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..b6192f7bf02c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.12.0
+version=78.13.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
+checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index 285e2419fccf..da7e7f4fdcbb 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
+checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
new file mode 100644
index 000000000000..edc82d772a75
--- /dev/null
+++ b/srcpkgs/timeshift/patches/d437358a.patch
@@ -0,0 +1,23 @@
+commit d437358ac3debf7625aefda4d0bd387a91b69df5
+Author: Tony George <teejeetech@gmail.com>
+Date:   Sun Jun 6 12:04:07 2021 +0530
+
+    Fix for #425, #753, #755
+
+diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
+index 18f09de..b276055 100755
+--- a/src/Utility/Device.vala
++++ b/src/Utility/Device.vala
+@@ -428,10 +428,10 @@ public class Device : GLib.Object{
+ 
+ 			try{
+ 				if (lsblk_is_ancient){
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
+ 				}
+ 				else{
+-					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
++					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
+ 				}
+ 
+ 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index ebdbb9ee28be..6977a413e750 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
new file mode 100644
index 000000000000..20eb85e27a6e
--- /dev/null
+++ b/srcpkgs/tootle/template
@@ -0,0 +1,13 @@
+# Template file for 'tootle'
+pkgname=tootle
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="vala pkg-config gettext glib-devel"
+makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
+short_desc="Native GTK Mastodon client"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bleakgrey/tootle/"
+distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
+checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 2a5430d43ec7..8985c36cd540 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.0
+version=3.24.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
+checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=1
+revision=2
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=1
+revision=2
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
new file mode 100644
index 000000000000..ec56043af570
--- /dev/null
+++ b/srcpkgs/ugdb/patches/atomicu64.patch
@@ -0,0 +1,28 @@
+commit db6e990cc46d69526beae930e0048f65d5510c34
+Author: q66 <daniel@octaforge.org>
+Date:   Tue Aug 10 18:52:51 2021 +0200
+
+    fix build on platforms without 64-bit atomics
+
+diff --git a/src/main.rs b/src/main.rs
+index ccfccab..fe2b52c 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -284,7 +284,7 @@ struct MpscTimer {
+     next_sender: Option<Sender<Event>>,
+     sender: Sender<Event>,
+     evt_fn: Box<dyn Fn() -> Event>,
+-    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
++    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
+ }
+ 
+ impl MpscTimer {
+@@ -293,7 +293,7 @@ impl MpscTimer {
+             next_sender: Some(sender.clone()),
+             sender,
+             evt_fn,
+-            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
++            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
+         }
+     }
+ 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 2220ee92948b..20f7ed0f2096 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,18 +1,15 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.9
+version=0.1.10
 revision=1
 build_style=cargo
+checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="nix-0.7.0 fails to build";;
-esac
+checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index e84c3b45f5c5..d69dc5429c43 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.6
+version=3.3.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
+checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 50fa577ef7a8..9e0faecb59b3 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
+checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=6
+revision=7
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index a992aa09bb97..77204e7fcd75 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.1
-revision=2
+version=1.13.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
new file mode 100644
index 000000000000..facf97c6674e
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
@@ -0,0 +1,47 @@
+From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Tue, 27 Jul 2021 23:41:30 -0300
+Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Per the man page, it shouldn't be used for security purposes. This is an
+issue especially on musl, where getlogin is implemented as
+getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
+set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ lib/pwdutils.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/pwdutils.c b/lib/pwdutils.c
+index d97020cb9..641a9da40 100644
+--- a/lib/pwdutils.c
++++ b/lib/pwdutils.c
+@@ -104,11 +104,6 @@ char *xgetlogin(void)
+ {
+ 	struct passwd *pw = NULL;
+ 	uid_t ruid;
+-	char *user;
+-
+-	user = getlogin();
+-	if (user)
+-		return xstrdup(user);
+ 
+ 	/* GNU Hurd implementation has an extension where a process can exist in a
+ 	 * non-conforming environment, and thus be outside the realms of POSIX
+@@ -117,6 +112,9 @@ char *xgetlogin(void)
+ 	 * environment.
+ 	 *
+ 	 * http://austingroupbugs.net/view.php?id=511
++	 *
++	 * The same implementation is useful for other systems, since getlogin(3)
++	 * shouldn't be used as actual identification.
+ 	 */
+ 	errno = 0;
+ 	ruid = getuid();
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
new file mode 100644
index 000000000000..d9dba317a592
--- /dev/null
+++ b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
@@ -0,0 +1,26 @@
+From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 29 Jul 2021 21:28:00 +0200
+Subject: [PATCH 1/6] sulogin: fix getpasswd()
+
+Fixes: https://github.com/karelzak/util-linux/issues/1400
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/sulogin.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
+index 3016ef483..4d48943ad 100644
+--- a/login-utils/sulogin.c
++++ b/login-utils/sulogin.c
+@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
+ 	cp = &con->cp;
+ 	tty = con->tio;
+ 
++	ret = pass;
+ 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
+ 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
+ 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
+-- 
+2.32.0
+
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 7094650c3202..37fca0298c83 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 870fe215fb92..795ba64667be 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.1
+version=0.48.3
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3.0-only"
+license="LGPL-2.1-or-later"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
+checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..84d126b4d87c
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,14 @@
+This patch disables tests that fail in github-ci, but pass on other linux systems.
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -706,9 +706,7 @@
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+-	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+ 	dbus/bug596862.vala \
+ 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..a663467846fc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,29 +1,34 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index d2af2f9be152..b94938be33ae 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.7.2
+version=1.8.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
+checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
new file mode 120000
index 000000000000..11fa71e74306
--- /dev/null
+++ b/srcpkgs/valadoc/patches
@@ -0,0 +1 @@
+../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 4593b7db5f69..cb48ff44da84 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.50.0
-revision=3
+version=0.52.4
+revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index b4d2377ac74c..dd9bd96aeb2a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.2
+version=2.10.4
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
+checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
new file mode 100644
index 000000000000..6222e905d8c9
--- /dev/null
+++ b/srcpkgs/vault-acme/template
@@ -0,0 +1,20 @@
+# Template file for 'vault-acme'
+pkgname=vault-acme
+version=0.0.8
+revision=1
+build_style=go
+go_import_path=github.com/remilapeyre/vault-acme
+go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
+depends="vault"
+short_desc="ACME backend for Hashicorp Vault"
+maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/remilapeyre/vault-acme"
+distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
+checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
+
+post_install() {
+	mv $DESTDIR/usr/bin/{acme,vault-acme}
+	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
+	vlicense LICENSE
+}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 85fc439ba9c7..a0d4649a461f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.6.1
+version=1.8.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
+_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
+checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
new file mode 100644
index 000000000000..4fc361225049
--- /dev/null
+++ b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
@@ -0,0 +1,31 @@
+From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
+From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
+Date: Fri, 25 Jun 2021 14:24:23 +0200
+Subject: [PATCH] support GCC standard libraries which do not define
+ __GLIBC_PREREQ
+
+---
+ Vc/global.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Vc/global.h b/Vc/global.h
+index 6f85b3ce2..d19dc45c2 100644
+--- a/Vc/global.h
++++ b/Vc/global.h
+@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #endif
+ 
+ #ifdef Vc_GCC
+-#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
++#  if Vc_GCC >= 0x70000 && defined __i386__
+      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
+      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
+      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
++#    ifdef __GLIBC_PREREQ
++#      if __GLIBC_PREREQ(2,26)
++#        define Vc_HAVE_STD_MAX_ALIGN_T 1
++#      endif
++#    endif
+ #  elif Vc_GCC >= 0x40900
+ #    define Vc_HAVE_STD_MAX_ALIGN_T 1
+ #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 9b2a89373446..63a77967b37c 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.1
+version=1.4.2
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
+checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 56049e393414..7c8f8290598a 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.0
+version=8.11.2
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
+checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 
 nopie=yes
 lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 294de567a6fb..73e735257f72 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,19 +1,14 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.2
+version=0.9.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
-checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
-
-# There are no tests definded. If they ever add tests, we'll be ready to run them
-do_check() {
-	xvfb-run dbus-run-session python setup.py test
-}
+checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
+make_check=no # no tests, but check fails with a non-zero return code
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.58.2
+version=1.59.0
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8bb9fde4f69a..55a808ac5ec5 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.1
+version=4.1.3
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
+checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
new file mode 100644
index 000000000000..27055015de3e
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -0,0 +1,214 @@
+From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 31 Jul 2021 22:31:52 +0200
+Subject: [PATCH 2/2] some big endian rendering fixes
+
+Source: Jacek Piszczek <jacek.piszczek@runbox.com>
+---
+ .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
+ .../platform/graphics/ImageBufferBackend.h    |   3 +
+ 2 files changed, 112 insertions(+)
+
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+index 9394e7bf..e704be6b 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
+@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
+ 
+ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
+     if (!alpha) {
+         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
+         return;
+@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8)
++    {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else
++    {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * 255) / alpha;
++            destPixel[2] = (srcPixel[2] * 255) / alpha;
++            destPixel[3] = (srcPixel[3] * 255) / alpha;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * 255) / alpha;
++        destPixel[1] = (srcPixel[1] * 255) / alpha;
++        destPixel[2] = (srcPixel[2] * 255) / alpha;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * 255) / alpha;
++        destPixel[1] = (srcPixel[2] * 255) / alpha;
++        destPixel[2] = (srcPixel[3] * 255) / alpha;
++        destPixel[3] = alpha;
++    }
++    else {
++        destPixel[0] = alpha;
++        destPixel[1] = (srcPixel[0] * 255) / alpha;
++        destPixel[2] = (srcPixel[1] * 255) / alpha;
++        destPixel[3] = (srcPixel[2] * 255) / alpha;
++    }
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * 255) / alpha;
+         destPixel[1] = (srcPixel[1] * 255) / alpha;
+@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * 255) / alpha;
+     destPixel[2] = (srcPixel[0] * 255) / alpha;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+ {
++#if CPU(BIG_ENDIAN)
++    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
++#else
+     uint8_t alpha = srcPixel[3];
++#endif
++
+     if (!alpha || alpha == 255) {
+         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    if (srcPixelFormat == destPixelFormat) {
++        if (srcPixelFormat == PixelFormat::ARGB8) {
++            destPixel[0] = alpha;
++            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
++            return;
++        }
++        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    if (srcPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
++        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
++        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
++        destPixel[3] = alpha;
++        return;
++    }
++
++    destPixel[0] = alpha;
++    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
++    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
++    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
++#else
+     if (srcPixelFormat == destPixelFormat) {
+         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
+         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
+     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
+     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
+     destPixel[3] = alpha;
++#endif
+ }
+ 
+ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
+@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
+         return;
+     }
+ 
++#if CPU(BIG_ENDIAN)
++    // Swap pixel channels ARGB <-> RGBA.
++    if (destPixelFormat == PixelFormat::ARGB8) {
++        destPixel[0] = srcPixel[3];
++        destPixel[1] = srcPixel[0];
++        destPixel[2] = srcPixel[1];
++        destPixel[3] = srcPixel[2];
++    }
++    else {
++        destPixel[0] = srcPixel[1];
++        destPixel[1] = srcPixel[2];
++        destPixel[2] = srcPixel[3];
++        destPixel[3] = srcPixel[0];
++    }
++#else
+     // Swap pixel channels BGRA <-> RGBA.
+     destPixel[0] = srcPixel[2];
+     destPixel[1] = srcPixel[1];
+     destPixel[2] = srcPixel[0];
+     destPixel[3] = srcPixel[3];
++#endif
+ }
+ 
+ template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
+@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
+     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
+ {
+     // We don't currently support getting or putting pixel data with deep color buffers.
++    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
+     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
+     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
+ 
+diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+index 31ce9775..4c52fa52 100644
+--- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
++++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
+@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
+ enum class PixelFormat : uint8_t {
+     RGBA8,
+     BGRA8,
++#if CPU(BIG_ENDIAN)
++    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
++#endif
+     RGB10,
+     RGB10A8,
+ };
+-- 
+2.31.1
+
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index 12011525f3ed..e11d62d50acf 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,3 +211,51 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
+diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+index 33be4058..1a6d69fd 100644
+--- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
+@@ -179,3 +179,9 @@
+ #else
+ #define OFFLINE_ASM_HAVE_FAST_TLS 0
+ #endif
++
++#if CPU(BIG_ENDIAN)
++#define OFFLINE_ASM_BIG_ENDIAN 1
++#else
++#define OFFLINE_ASM_BIG_ENDIAN 0
++#endif
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 20c0c40b..10c58846 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+ 
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
+     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+index 27e76d2f..bfb2a46e 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
+     
+ .opGetByValNotDouble:
+     subi ArrayStorageShape, t2
+-    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    if BIG_ENDIAN
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
++    else
++        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
++    end
+     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
+     get(m_dst, t0)
+     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..547847a65956 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,7 +21,8 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
+ geoclue2 libharfbuzz which libpsl
+ $(vopt_if wayland 'wayland-devel libxml2-devel')"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -29,7 +30,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=4
+revision=5
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 675b1a3ab50e..4b9873e09451 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.2.0
+version=6.3.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
+checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 0fc85f2461f7..3c79d36512d4 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.13/dlls/dnsapi/libresolv.c
-+++ b/wine-6.13/dlls/dnsapi/libresolv.c
+--- a/wine-6.15/dlls/dnsapi/libresolv.c
++++ b/wine-6.15/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 24d2505627d2..2e0376c44712 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.13
+version=6.15
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
- 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
+checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
+ 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 7e8ee6ad993f..3570896a1dc5 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.11
+version=0.12
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
+checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index fdb9a6b2120e..d54f00def807 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10161
-revision=2
+version=11.1.0.10702
+revision=1
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
+checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.4
+version=3.5
 revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
 
 build_options="altivec assembly"
 
@@ -29,7 +30,11 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*) hostmakedepends+=" nasm" ;;
+		x86_64*|i686*)
+			# see https://bitbucket.org/multicoreware/x265_git/issues/559
+			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+			hostmakedepends+=" nasm"
+			;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index cc8ba08a4391..4e5bcc423bed 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.3
+version=5.22.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
+checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index d4094a292126..b2c323f8c311 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash"
+depends="bash xset"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 465e71fa29bd..2ba17de116f6 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20160805.1
+version=3.20210804.2
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,8 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
-CFLAGS="-std=c99"
+checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -21,6 +20,7 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 1ea4c63d37bc..479f602b22f0 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.1.2
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
+checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index c8ec5bb1db53..8c3d0d56f820 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,27 +1,22 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=19.1.0
-revision=2
+version=21.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
- libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
+ pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
+checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
 
 lib32disabled=yes
-CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv6*) broken="no dri.h";;
-esac
-
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2ad44227da84..2efa4c1f6a19 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.95
+version=1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,9 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
-
-CFLAGS="-fcommon"
+checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 9ff8f43e7556..708899ad4e24 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.37
-revision=2
+version=0.39
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="http://xmobar.org"
+homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
+checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 800d5dccff7c..761989ce69a7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.12
+version=1.20.13
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
+checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d19653dfd55d..d776a8ac7114 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
+checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index b0e1ebe6cd22..a046b128e92e 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template build file for 'xwd'.
+# Template file for 'xwd'
 pkgname=xwd
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
+checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index c860376e7733..dc65a67c8bd4 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,13 +1,14 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.04.3
+version=21.08.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
+checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
new file mode 100644
index 000000000000..2315031f0c1c
--- /dev/null
+++ b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
@@ -0,0 +1,27 @@
+From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Thu, 29 Jul 2021 15:57:00 -0300
+Subject: [PATCH] bar: fix typo.
+
+Running 'yambar --backend=wayland' would always error out saying it was
+built without wayland support.
+---
+ bar/bar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bar/bar.c b/bar/bar.c
+index 4829162..c7b1ea5 100644
+--- a/bar/bar.c
++++ b/bar/bar.c
+@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
+         break;
+ 
+     case BAR_BACKEND_WAYLAND:
+-#if defined(BAR_WAYLAND)
++#if defined(ENABLE_WAYLAND)
+         backend_data = bar_backend_wayland_new();
+         backend_iface = &wayland_backend_iface;
+ #else
+-- 
+2.32.0
+
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index a2608045b3ad..19167b33badb 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=1
+revision=2
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 0b5aa770e7fb..b30773537d39 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.3
+version=3.9.4
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
+checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 7aff4456b5e8..10190fa6f694 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,22 +1,21 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.6
+version=0.3.7
 revision=2
 build_style=meson
+configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec"
+ libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
+checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
 conflicts="zathura-pdf-poppler>=0"
 
-LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 19b3d771d895..2ca4483f9147 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.6
-revision=3
+version=0.2.7
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 545f91da5006..153648a0ac40 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
+checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index ef5b208e2db3..71628a6c079a 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.26030.0627
+version=5.7.28991.0726
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
+checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c9aa983cc2bf..c8c7ab2176e4 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.1
+version=0.7.3
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
+checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 668cccd4f349..0e8e13b53325 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,21 +1,18 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.6.4
-revision=2
+version=0.7.0
+revision=1
+build_style=gnu-makefile
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
-
-do_build() {
-	make
-}
+checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            case "$XBPS_TARGET" in
+                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+            esac
         fi
     done
 }
@@ -689,12 +692,6 @@ fi
 
 check_build_requirements
 
-if [ -z "$IN_CHROOT" ]; then
-    trap 'exit_func' INT TERM
-    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
-        setup_distfiles_mirror
-    fi
-fi
 #
 # Read funcs from helpers
 #
@@ -702,6 +699,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
     [ -r "$f" ] && . $f
 done
 
+if [ -z "$IN_CHROOT" ]; then
+    trap 'exit_func' INT TERM
+    if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+        setup_distfiles_mirror
+    fi
+fi
+
 reconfigure_base_chroot
 
 #

From 16430b58cb62b3daa87e87f1e90b20f4614a2c20 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 02:57:20 +0200
Subject: [PATCH 5/8] empty

---
 srcpkgs/libcgroup/empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 srcpkgs/libcgroup/empty

diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
new file mode 100644
index 000000000000..e69de29bb2d1

From ef1055f00a3c1edf9d87cfddfb2ff9178d2a19ec Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Fri, 20 Aug 2021 03:05:21 +0200
Subject: [PATCH 6/8] Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.
---
 README.md                                     |  35 +-
 common/environment/setup/install.sh           |   5 +-
 common/shlibs                                 |  61 +-
 common/travis/license.lst                     |  14 -
 srcpkgs/0ad-data/template                     |   4 +-
 srcpkgs/0ad/patches/ppc64.patch               | 113 +++
 srcpkgs/0ad/template                          |   4 +-
 srcpkgs/ART/template                          |  15 -
 srcpkgs/Aegisub/template                      |   2 +-
 srcpkgs/CLion/template                        |  46 +-
 srcpkgs/CUnit-devel                           |   1 -
 srcpkgs/CUnit/template                        |  37 -
 srcpkgs/CUnit/update                          |   1 -
 srcpkgs/ImageMagick/template                  |   2 +-
 srcpkgs/ImageMagick6/template                 |  86 +++
 srcpkgs/ImageMagick6/update                   |   1 +
 srcpkgs/Komikku/patches/fix-mangadex.patch    |  82 --
 srcpkgs/Komikku/template                      |   8 +-
 .../patches/ppc/musl-ppc-secureplt.patch      |  12 +-
 .../patches/ppc64/add-ppc64-support.patch     |  48 +-
 .../patches/ppc64/fix-vm-jit-ppc64.patch      |   4 +-
 srcpkgs/LuaJIT/template                       |   2 +-
 srcpkgs/OpenRCT2/template                     |  11 +-
 srcpkgs/R-cran-ggplot2/template               |   4 +-
 srcpkgs/R-cran-stringi/template               |   6 +-
 srcpkgs/R/template                            |   2 +-
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch |  32 -
 srcpkgs/SDL2/template                         |  24 +-
 srcpkgs/SLADE/template                        |   6 +-
 .../patches/libfmt8-compatibility.patch       |  40 -
 srcpkgs/Waybar/template                       |   2 +-
 srcpkgs/abcmidi/template                      |  12 -
 srcpkgs/akonadi-calendar/template             |   4 +-
 srcpkgs/akonadi-contacts/template             |   6 +-
 srcpkgs/akonadi-import-wizard/template        |   4 +-
 srcpkgs/akonadi-mime/template                 |   4 +-
 srcpkgs/akonadi-notes/template                |   4 +-
 srcpkgs/akonadi-search/template               |   4 +-
 srcpkgs/akonadi5/template                     |   4 +-
 srcpkgs/alacritty/template                    |   6 +-
 srcpkgs/alsa_rnnoise/template                 |  14 -
 .../patches/cmake-build-type-none.patch       |  16 +
 srcpkgs/amdvlk/template                       |  20 +-
 srcpkgs/an/template                           |   2 +-
 srcpkgs/apk-tools/template                    |   4 +-
 srcpkgs/apostrophe/template                   |   5 +-
 srcpkgs/arcan/template                        |  13 +-
 srcpkgs/arcan_sdl                             |   1 -
 srcpkgs/ardour/template                       |   4 +-
 srcpkgs/ark/template                          |   4 +-
 srcpkgs/attica/template                       |   4 +-
 srcpkgs/avidemux/template                     |   2 +-
 srcpkgs/babashka/template                     |  24 +-
 srcpkgs/baloo-widgets5/template               |   4 +-
 srcpkgs/baloo5/template                       |   4 +-
 srcpkgs/bcc/template                          |  17 +-
 srcpkgs/benchmark/template                    |   4 +-
 srcpkgs/bluedevil/template                    |   4 +-
 srcpkgs/bluez-qt5/template                    |   4 +-
 srcpkgs/bmake/template                        |   8 +-
 srcpkgs/bomi/patches/ffmpeg3.x.patch          |  32 +
 srcpkgs/bomi/patches/ffmpeg4.patch            | 195 +++++
 srcpkgs/bomi/patches/fix-cxx14.patch          |  67 ++
 srcpkgs/bomi/patches/fix-sysctl_h.patch       |  22 +
 srcpkgs/bomi/template                         |  35 +
 srcpkgs/boost/template                        |   2 +-
 srcpkgs/bpftrace/template                     |   3 +-
 srcpkgs/breeze-gtk/template                   |   4 +-
 srcpkgs/breeze-icons/template                 |   4 +-
 srcpkgs/breeze/template                       |   4 +-
 srcpkgs/brltty/template                       |   2 +-
 srcpkgs/broot/template                        |   4 +-
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch |  56 ++
 srcpkgs/btrfs-progs/template                  |   6 +-
 srcpkgs/byacc/template                        |   4 +-
 srcpkgs/c-ares/template                       |   6 +-
 srcpkgs/calendarsupport/template              |   4 +-
 srcpkgs/calibre/template                      |   2 +-
 srcpkgs/catfish/template                      |   4 +-
 .../catgirl/patches/add-missing-include.patch |  10 -
 srcpkgs/catgirl/template                      |   6 +-
 srcpkgs/cbindgen/template                     |   2 +-
 srcpkgs/cc65/template                         |   4 +-
 srcpkgs/ccextractor/template                  |   4 +-
 srcpkgs/cherrytree/template                   |   9 +-
 srcpkgs/chezmoi/template                      |   4 +-
 srcpkgs/chroot-git/template                   |  20 +-
 srcpkgs/clamav/template                       |   2 +-
 srcpkgs/claws-mail/template                   |   4 +-
 ...ipts-with-llvm-clang-provided-cmake-.patch | 364 ---------
 ...a6e3393ebc75e16c91e606ad2015a16295c3.patch |  88 +++
 srcpkgs/clazy/template                        |  11 +-
 srcpkgs/clojure/template                      |   6 +-
 srcpkgs/cmake-gui/template                    |   9 +-
 srcpkgs/cmake/patches/ar-lwyu.patch           |  20 -
 .../patches/ignore-crape-compiler-test.patch  |  13 -
 srcpkgs/cmake/patches/test-none.patch         |  41 +
 srcpkgs/cmake/template                        |  11 +-
 srcpkgs/cmus/template                         |   2 +-
 srcpkgs/consul/template                       |   6 +-
 srcpkgs/cozy/template                         |  12 +-
 srcpkgs/cpp-utilities/template                |   4 +-
 srcpkgs/crawl-tiles/template                  |   4 +-
 srcpkgs/crawl/template                        |   4 +-
 srcpkgs/crispy-doom/template                  |   4 +-
 srcpkgs/croc/template                         |   4 +-
 srcpkgs/crun/template                         |   4 +-
 srcpkgs/cryfs/template                        |   4 +-
 srcpkgs/darktable/template                    |   2 +-
 srcpkgs/dbeaver/template                      |   4 +-
 srcpkgs/deluge/files/deluged/run              |   2 +-
 srcpkgs/deluge/patches/drop-priv.patch        |  40 -
 srcpkgs/deluge/template                       |   2 +-
 srcpkgs/dialog/template                       |   4 +-
 srcpkgs/diffoscope/template                   |   4 +-
 srcpkgs/dino/template                         |   2 +-
 srcpkgs/dlayer/template                       |   4 +-
 .../dnscrypt-proxy/files/dnscrypt-proxy/run   |   1 -
 srcpkgs/dnscrypt-proxy/template               |   2 +-
 srcpkgs/dnsdist/files/dnsdist/run             |   4 -
 srcpkgs/dnsdist/template                      |  36 -
 srcpkgs/dnsdist/update                        |   1 -
 srcpkgs/doctl/template                        |   4 +-
 .../dolphin-emu/patches/VkDeviceMemory.patch  |  37 +
 srcpkgs/dolphin-emu/template                  |  20 +-
 srcpkgs/dolphin-plugins/template              |   4 +-
 srcpkgs/dolphin/template                      |   4 +-
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/dovecot-plugin-pigeonhole/template    |   4 +-
 srcpkgs/dovecot/INSTALL                       |   9 +
 srcpkgs/dovecot/INSTALL.msg                   |   6 +
 srcpkgs/dovecot/template                      |   6 +-
 srcpkgs/drone-cli/template                    |   4 +-
 srcpkgs/dwdiff/template                       |   2 +-
 srcpkgs/ejabberd/template                     |   8 +-
 srcpkgs/electrum/template                     |   4 +-
 srcpkgs/elisa/template                        |   4 +-
 srcpkgs/emptty/template                       |   4 +-
 srcpkgs/enchant2/template                     |   4 +-
 srcpkgs/erlang/template                       |   4 +-
 srcpkgs/evilwm/files/evilwm.desktop           |  11 +
 srcpkgs/evilwm/template                       |  17 +-
 srcpkgs/evolution-data-server/template        |   2 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/extra-cmake-modules/template          |   4 +-
 srcpkgs/extrace/template                      |   6 +-
 srcpkgs/fail2ban/template                     |  12 +-
 srcpkgs/fcft/template                         |   4 +-
 srcpkgs/fetchmail/template                    |   4 +-
 srcpkgs/ffmpeg/template                       |   4 +-
 srcpkgs/filelight/template                    |   4 +-
 srcpkgs/filezilla/patches/libtool_tag.patch   |  11 +
 srcpkgs/filezilla/template                    |   4 +-
 srcpkgs/firefox-esr-i18n/template             | 188 ++---
 srcpkgs/firefox-esr/template                  |   4 +-
 srcpkgs/firefox-i18n/template                 | 196 ++---
 srcpkgs/firefox/patches/lto-thin.patch        |  19 -
 srcpkgs/firefox/template                      |   6 +-
 srcpkgs/flameshot/template                    |   4 +-
 srcpkgs/fmt/template                          |   7 +-
 srcpkgs/font-awesome5/template                |   5 +-
 srcpkgs/font-iosevka/template                 |   6 +-
 srcpkgs/font-sarasa-gothic/template           |   4 +-
 srcpkgs/frameworkintegration/template         |   4 +-
 srcpkgs/freeplane/template                    |   4 +-
 srcpkgs/freerdp/template                      |   7 +-
 srcpkgs/freshplayerplugin/template            |   2 +-
 srcpkgs/fstrm/template                        |   6 +-
 srcpkgs/fuzzel/template                       |   4 +-
 srcpkgs/geary/template                        |  12 +-
 srcpkgs/gerbera/template                      |   2 +-
 srcpkgs/gespeaker/template                    |  15 +
 srcpkgs/gi-docgen/template                    |  14 -
 srcpkgs/giac/patches/pari_2_13.patch          |  16 -
 srcpkgs/giac/template                         |   2 +-
 srcpkgs/git-lfs/INSTALL.msg                   |   1 +
 srcpkgs/git-lfs/template                      |   2 +-
 srcpkgs/git/template                          |   8 +-
 srcpkgs/github-cli/template                   |   4 +-
 srcpkgs/gnome-desktop/template                |   4 +-
 srcpkgs/gnome-shell-extensions/template       |   5 +-
 srcpkgs/gnome-shell-mousewheel-zoom/template  |  23 +
 srcpkgs/gnome-shell/template                  |  21 +-
 srcpkgs/gnucash/template                      |   2 +-
 srcpkgs/gnustep-base/template                 |   2 +-
 srcpkgs/gnustep-gui/template                  |   2 +-
 srcpkgs/go/template                           |   4 +-
 srcpkgs/google-chrome/template                |   4 +-
 srcpkgs/gopls/template                        |   4 +-
 srcpkgs/gotop/template                        |   4 +-
 srcpkgs/goxel/template                        |   4 +-
 srcpkgs/gparted/template                      |   4 +-
 srcpkgs/gpodder/template                      |  14 +-
 srcpkgs/grantleetheme/template                |   4 +-
 srcpkgs/graphviz/template                     |   3 +-
 srcpkgs/grpc/template                         |   4 +-
 srcpkgs/gst-plugins-bad1/template             |   2 +-
 srcpkgs/gtk4-doc                              |   1 -
 srcpkgs/gtk4/patches/fix-sysprof.patch        |  23 -
 srcpkgs/gtk4/template                         |  36 +-
 srcpkgs/gucci/template                        |   4 +-
 srcpkgs/gwenview/template                     |   7 +-
 srcpkgs/gzdoom/template                       |   8 +-
 srcpkgs/handbrake/template                    |   2 +-
 srcpkgs/haproxy/files/haproxy.cfg             |   1 -
 srcpkgs/haproxy/files/haproxy/run             |   2 +-
 srcpkgs/haproxy/template                      |   6 +-
 srcpkgs/harfbuzz/template                     |   8 +-
 srcpkgs/hcloud/template                       |   4 +-
 srcpkgs/hello/template                        |  11 -
 srcpkgs/help2man/template                     |   4 +-
 srcpkgs/herbstluftwm/template                 |  11 +-
 srcpkgs/hivex/template                        |   6 +-
 srcpkgs/homebank/template                     |   6 +-
 srcpkgs/hopper/template                       |   4 +-
 srcpkgs/hugo/template                         |   4 +-
 srcpkgs/hunspell-pl_PL/template               |   4 +-
 srcpkgs/hydroxide/template                    |   4 +-
 srcpkgs/i3status-rust/template                |   6 +-
 srcpkgs/ibus-bamboo/template                  |   9 +-
 srcpkgs/icdiff/template                       |   9 +-
 srcpkgs/icewm/template                        |   4 +-
 srcpkgs/icu/template                          |   8 +-
 srcpkgs/icu4lua/patches/icu-68.patch          |  94 ---
 srcpkgs/icu4lua/template                      |   2 +-
 ...heck-for-.pc-files-before-using-them.patch |  32 +
 srcpkgs/iio-sensor-proxy/template             |  13 +-
 srcpkgs/img2pdf/template                      |   2 +-
 srcpkgs/imlib2/template                       |   4 +-
 srcpkgs/imv/template                          |   4 +-
 srcpkgs/instaloader/template                  |   4 +-
 .../intellij-idea-ultimate-edition/template   |   7 +-
 srcpkgs/io.elementary.code/template           |   2 +-
 srcpkgs/ipset/template                        |   4 +-
 srcpkgs/iputils/template                      |   6 +-
 srcpkgs/iputils/update                        |   1 +
 srcpkgs/isync/template                        |   4 +-
 srcpkgs/iverilog/template                     |   2 +-
 srcpkgs/jrnl/template                         |   4 +-
 srcpkgs/jupyterlab/template                   |   6 +-
 srcpkgs/k9s/template                          |   4 +-
 srcpkgs/kaccounts-integration/template        |   4 +-
 srcpkgs/kaccounts-providers/template          |   4 +-
 srcpkgs/kactivities5-stats/template           |   4 +-
 srcpkgs/kactivities5/template                 |   4 +-
 srcpkgs/kactivitymanagerd/template            |   4 +-
 srcpkgs/kalarmcal/template                    |   4 +-
 srcpkgs/kamoso/template                       |   4 +-
 srcpkgs/kapidox/template                      |   4 +-
 srcpkgs/karchive/template                     |   4 +-
 srcpkgs/kate5/template                        |   4 +-
 srcpkgs/kauth/template                        |   4 +-
 srcpkgs/kbookmarks/template                   |   4 +-
 srcpkgs/kcachegrind/template                  |   4 +-
 srcpkgs/kcalendarcore/template                |   4 +-
 srcpkgs/kcalutils/template                    |   4 +-
 srcpkgs/kcmutils/template                     |   4 +-
 srcpkgs/kcodecs/template                      |   4 +-
 srcpkgs/kcompletion/template                  |   4 +-
 srcpkgs/kconfig/template                      |   4 +-
 srcpkgs/kconfigwidgets/template               |   4 +-
 srcpkgs/kcontacts/template                    |   4 +-
 srcpkgs/kcoreaddons/template                  |   4 +-
 srcpkgs/kcrash/template                       |   4 +-
 srcpkgs/kcron/template                        |   4 +-
 srcpkgs/kdav/template                         |   4 +-
 srcpkgs/kdb/patches/kdb-fix-build.patch       |  67 --
 srcpkgs/kdb/patches/kdb-mkspecs-path.patch    |  33 -
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kdbusaddons/template                  |   4 +-
 srcpkgs/kde-cli-tools/template                |   4 +-
 srcpkgs/kde-gtk-config5/template              |   4 +-
 srcpkgs/kde5-baseapps/template                |   2 +-
 srcpkgs/kdeclarative/template                 |   4 +-
 srcpkgs/kdeconnect/template                   |  13 +-
 srcpkgs/kdecoration/template                  |   4 +-
 srcpkgs/kded/template                         |   4 +-
 srcpkgs/kdegraphics-thumbnailers/template     |   4 +-
 srcpkgs/kdelibs4support/template              |   4 +-
 srcpkgs/kdenlive/template                     |   2 +-
 srcpkgs/kdepim-runtime/template               |   4 +-
 srcpkgs/kdeplasma-addons5/template            |   4 +-
 srcpkgs/kdesignerplugin/template              |   4 +-
 srcpkgs/kdesu/template                        |   4 +-
 srcpkgs/kdewebkit/template                    |   4 +-
 srcpkgs/kdialog/template                      |   4 +-
 srcpkgs/kdnssd/template                       |   4 +-
 srcpkgs/kdoctools/template                    |   4 +-
 .../patches/20.08.3--fix-tests.patch          |  28 +
 srcpkgs/keditbookmarks/template               |   4 +-
 srcpkgs/kemoticons/template                   |   4 +-
 srcpkgs/kfilemetadata5/template               |   4 +-
 srcpkgs/kfind/template                        |   4 +-
 srcpkgs/kgamma5/template                      |   4 +-
 srcpkgs/kglobalaccel/template                 |   4 +-
 srcpkgs/kguiaddons/template                   |   4 +-
 srcpkgs/khal/template                         |   5 +-
 srcpkgs/khelpcenter/template                  |   4 +-
 srcpkgs/kholidays/template                    |   4 +-
 srcpkgs/khotkeys/template                     |   4 +-
 srcpkgs/khtml/template                        |   4 +-
 srcpkgs/ki18n/template                        |   4 +-
 srcpkgs/kiconthemes/template                  |   4 +-
 srcpkgs/kidentitymanagement/template          |   4 +-
 srcpkgs/kidletime/template                    |   4 +-
 srcpkgs/kig/template                          |   4 +-
 srcpkgs/kimageformats/template                |   4 +-
 srcpkgs/kimap/template                        |   4 +-
 srcpkgs/kinfocenter/template                  |   4 +-
 srcpkgs/kinit/template                        |   4 +-
 srcpkgs/kio-extras/template                   |   4 +-
 srcpkgs/kio-gdrive/template                   |   4 +-
 srcpkgs/kio/template                          |   4 +-
 srcpkgs/kirigami2/template                    |   4 +-
 srcpkgs/kitemmodels/template                  |   4 +-
 srcpkgs/kitemviews/template                   |   4 +-
 srcpkgs/kitty/template                        |   4 +-
 srcpkgs/kiwix-lib/template                    |   4 +-
 srcpkgs/kjobwidgets/template                  |   4 +-
 srcpkgs/kjs/template                          |   4 +-
 srcpkgs/kjsembed/template                     |   4 +-
 srcpkgs/kldap/template                        |   4 +-
 srcpkgs/kleopatra/template                    |   4 +-
 srcpkgs/kmag/template                         |   4 +-
 srcpkgs/kmail-account-wizard/template         |   4 +-
 srcpkgs/kmail/template                        |   6 +-
 srcpkgs/kmailtransport/template               |   4 +-
 srcpkgs/kmbox/template                        |   4 +-
 srcpkgs/kmediaplayer/template                 |   4 +-
 srcpkgs/kmenuedit/template                    |   4 +-
 srcpkgs/kmime/template                        |   4 +-
 srcpkgs/kmix/template                         |   4 +-
 srcpkgs/knewstuff/template                    |   5 +-
 srcpkgs/knights/template                      |   4 +-
 srcpkgs/knot-resolver/template                |  11 +-
 srcpkgs/knot/template                         |   4 +-
 srcpkgs/knotifications/template               |   4 +-
 srcpkgs/knotifyconfig/template                |   4 +-
 srcpkgs/kodi-rpi                              |   1 -
 srcpkgs/kodi-rpi/INSTALL                      |   6 +
 srcpkgs/kodi-rpi/REMOVE                       |   5 +
 srcpkgs/kodi-rpi/files/xbmc-standalone/run    |   3 +
 .../patches/add-missing-cassert.patch         |  20 +
 .../patches/add-missing-includes.patch        |  10 +
 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch  |  37 +
 .../disable-static-texturepacker-build.patch  |  11 +
 srcpkgs/kodi-rpi/patches/fix-fileemu.patch    |  74 ++
 srcpkgs/kodi-rpi/patches/fix-musl.patch       |  11 +
 .../kodi-rpi/patches/fortify-source-fix.patch |  11 +
 srcpkgs/kodi-rpi/patches/ppc64.patch          |  15 +
 .../kodi-rpi/patches/remove-filewrap.patch    |  40 +
 srcpkgs/kodi-rpi/template                     | 119 +++
 srcpkgs/kodi-rpi/update                       |   1 +
 srcpkgs/kodi/patches/fmt8-support.patch       |   7 -
 srcpkgs/kodi/template                         |   8 +-
 srcpkgs/kolourpaint/template                  |   4 +-
 srcpkgs/kompare/template                      |   4 +-
 srcpkgs/konsole/template                      |   4 +-
 srcpkgs/kontactinterface/template             |   4 +-
 srcpkgs/konversation/template                 |  15 +-
 srcpkgs/kpackage/template                     |   4 +-
 srcpkgs/kparts/template                       |   4 +-
 srcpkgs/kpat/template                         |   4 +-
 srcpkgs/kpeople/template                      |   4 +-
 srcpkgs/kpimtextedit/template                 |   4 +-
 srcpkgs/kplotting/template                    |   4 +-
 srcpkgs/kpty/template                         |   4 +-
 srcpkgs/kqtquickcharts/template               |   4 +-
 srcpkgs/kquickcharts/template                 |   4 +-
 srcpkgs/krfb/template                         |   4 +-
 srcpkgs/krita/patches/aarch64.patch           |  19 -
 srcpkgs/krita/patches/cross.patch             |  13 -
 srcpkgs/krita/patches/invalid-MimeType.patch  |  11 +
 srcpkgs/krita/template                        |   4 +-
 srcpkgs/kross/template                        |   4 +-
 srcpkgs/kruler/template                       |   4 +-
 srcpkgs/krunner/template                      |   4 +-
 srcpkgs/kscreen/template                      |   4 +-
 srcpkgs/kscreenlocker/template                |   4 +-
 srcpkgs/kservice/template                     |   4 +-
 srcpkgs/ksmtp/template                        |   4 +-
 srcpkgs/ksolid/template                       |   4 +-
 srcpkgs/ksshaskpass/template                  |   4 +-
 srcpkgs/ksystemlog/template                   |   4 +-
 srcpkgs/ksystemstats/template                 |   4 +-
 srcpkgs/kteatime/template                     |   4 +-
 srcpkgs/ktexteditor/template                  |   4 +-
 srcpkgs/ktextwidgets/template                 |   4 +-
 srcpkgs/ktnef/template                        |   4 +-
 srcpkgs/ktuberling/template                   |   4 +-
 srcpkgs/kturtle/template                      |   4 +-
 srcpkgs/kubernetes/template                   |   6 +-
 srcpkgs/kunitconversion/template              |   4 +-
 srcpkgs/kvantum/template                      |   4 +-
 srcpkgs/kwallet-pam/template                  |   4 +-
 srcpkgs/kwallet/template                      |   4 +-
 srcpkgs/kwalletmanager/template               |   4 +-
 srcpkgs/kwayland-integration/template         |   4 +-
 srcpkgs/kwayland-server/template              |   4 +-
 srcpkgs/kwayland/template                     |   4 +-
 srcpkgs/kwidgetsaddons/template               |   4 +-
 srcpkgs/kwin/template                         |   4 +-
 srcpkgs/kwindowsystem/template                |   4 +-
 srcpkgs/kwrited/template                      |   4 +-
 srcpkgs/kxmlgui/template                      |   4 +-
 srcpkgs/kxmlrpcclient/template                |   4 +-
 srcpkgs/lagrange/template                     |   4 +-
 srcpkgs/layer-shell-qt/template               |   4 +-
 .../handle_new_xorgproto_symbols.patch        |  42 --
 srcpkgs/libX11/template                       |   2 +-
 srcpkgs/libXft/template                       |   6 +-
 srcpkgs/libadwaita-demo                       |   1 -
 srcpkgs/libadwaita-devel                      |   1 -
 .../patches/disable-broken-tests.patch        |  10 -
 srcpkgs/libadwaita/template                   |  59 --
 srcpkgs/libbitcoin-blockchain/template        |   2 +-
 srcpkgs/libbitcoin-client/template            |   2 +-
 srcpkgs/libbitcoin-database/template          |   2 +-
 srcpkgs/libbitcoin-explorer/template          |   2 +-
 srcpkgs/libbitcoin-network/template           |   2 +-
 srcpkgs/libbitcoin-node/template              |   2 +-
 srcpkgs/libbitcoin-protocol/template          |   2 +-
 srcpkgs/libbitcoin-server/template            |   2 +-
 srcpkgs/libbitcoin-system/template            |   2 +-
 srcpkgs/libcap/template                       |   4 +-
 srcpkgs/libcdr/template                       |   2 +-
 srcpkgs/libcgroup/empty                       |   0
 srcpkgs/libcgroup/template                    |  18 +-
 srcpkgs/libcgroup/update                      |   1 +
 srcpkgs/libdecor-devel                        |   1 -
 srcpkgs/libdecor/template                     |  32 -
 srcpkgs/libe-book/patches/icu-68.patch        |  20 -
 srcpkgs/libe-book/template                    |   2 +-
 srcpkgs/libfilezilla/template                 |   4 +-
 srcpkgs/libgdal/template                      |   2 +-
 srcpkgs/libgnt                                |   1 +
 srcpkgs/libgnt-devel                          |   2 +-
 srcpkgs/libgnt/patches/cross-fix.diff         | 130 ----
 srcpkgs/libgnt/template                       |  31 -
 srcpkgs/libgravatar/template                  |   4 +-
 srcpkgs/libheif/template                      |   2 +-
 srcpkgs/libical/patches/fix-cross.patch       |  58 +-
 srcpkgs/libical/template                      |   7 +-
 srcpkgs/libid3tag/template                    |   4 +-
 srcpkgs/libinput/template                     |   4 +-
 srcpkgs/libjpeg-turbo/template                |   4 +-
 srcpkgs/libkcddb/template                     |   4 +-
 srcpkgs/libkdcraw5/template                   |   4 +-
 srcpkgs/libkdegames/template                  |   4 +-
 srcpkgs/libkdepim/template                    |   4 +-
 srcpkgs/libkexiv25/template                   |   4 +-
 srcpkgs/libkgapi/template                     |   4 +-
 srcpkgs/libkipi5/template                     |   4 +-
 srcpkgs/libkleo/template                      |   4 +-
 srcpkgs/libkomparediff2/template              |   4 +-
 srcpkgs/libkscreen/template                   |   4 +-
 srcpkgs/libksieve/template                    |   4 +-
 srcpkgs/libksysguard/template                 |   4 +-
 srcpkgs/liblcf/template                       |   2 +-
 srcpkgs/libmagick6                            |   1 +
 srcpkgs/libmagick6-devel                      |   1 +
 srcpkgs/libmagick6-perl                       |   1 +
 srcpkgs/libmbim/template                      |   4 +-
 srcpkgs/libmspub/template                     |   2 +-
 srcpkgs/libnsl/template                       |   4 +-
 srcpkgs/libpsl/template                       |   2 +-
 srcpkgs/libqxp/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/libspa-ffmpeg                         |   1 +
 srcpkgs/libstemmer                            |   1 -
 srcpkgs/libstemmer-devel                      |   1 -
 srcpkgs/libvirt-python3/template              |   4 +-
 srcpkgs/libvirt/template                      |   4 +-
 srcpkgs/libvisio/template                     |   2 +-
 srcpkgs/libx86/template                       |  16 +-
 srcpkgs/libxlsxwriter/template                |   4 +-
 srcpkgs/libxml2/patches/icu-68.patch          |  25 -
 srcpkgs/libxml2/template                      |   2 +-
 srcpkgs/libzim/template                       |   2 +-
 srcpkgs/linux-base/template                   |  18 -
 srcpkgs/linux-lts/template                    |  22 +-
 srcpkgs/linux/template                        |  21 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |   4 +-
 srcpkgs/linux4.19/template                    |   4 +-
 srcpkgs/linux4.19/templateu                   | 331 --------
 srcpkgs/linux5.10/template                    |   6 +-
 srcpkgs/linux5.13/files/i386-dotconfig        |  24 +-
 srcpkgs/linux5.13/files/ppc-dotconfig         |  17 +-
 srcpkgs/linux5.13/files/x86_64-dotconfig      |  28 +-
 srcpkgs/linux5.13/template                    |   6 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |   3 +-
 srcpkgs/linux5.4/template                     |   4 +-
 srcpkgs/lnav/template                         |  16 +-
 srcpkgs/log4cpp/template                      |   2 +-
 srcpkgs/lowdown/template                      |   4 +-
 srcpkgs/lynx/template                         |  11 +-
 srcpkgs/lynx/update                           |   5 +
 srcpkgs/mailcommon/template                   |   4 +-
 srcpkgs/mailimporter/template                 |   4 +-
 srcpkgs/maim/template                         |   2 +-
 srcpkgs/marble5/template                      |   4 +-
 srcpkgs/master-pdf-editor/template            |   8 +-
 srcpkgs/mbedtls/template                      |   4 +-
 srcpkgs/mdBook/template                       |   4 +-
 srcpkgs/meld/template                         |   4 +-
 srcpkgs/mercurial/template                    |   2 +-
 srcpkgs/mesa/template                         |  15 +-
 .../dont-use-native-pkgconfig-for-gir.patch   |  11 +
 srcpkgs/meson/patches/fix-unittest.patch      |  77 ++
 srcpkgs/meson/template                        |   7 +-
 srcpkgs/messagelib/template                   |   4 +-
 srcpkgs/micro/template                        |   5 +-
 srcpkgs/milou/template                        |   4 +-
 srcpkgs/minify/template                       |   4 +-
 srcpkgs/mkvtoolnix/template                   |   6 +-
 srcpkgs/modemmanager-qt5/template             |   4 +-
 srcpkgs/modsecurity/template                  |   2 +-
 srcpkgs/mongo-c-driver/template               |   4 +-
 srcpkgs/monit/template                        |   4 +-
 srcpkgs/mosquitto/template                    |   9 +-
 srcpkgs/mousepad/template                     |   6 +-
 srcpkgs/mozjs78/template                      |   2 +-
 srcpkgs/mpd/template                          |   4 +-
 srcpkgs/mu/template                           |  36 +
 srcpkgs/mu4e                                  |   1 +
 srcpkgs/mu4e/template                         |  22 -
 .../musl/patches/fix-pi-mutex-cond-1.patch    |  56 --
 .../musl/patches/fix-pi-mutex-cond-2.patch    |  48 --
 .../musl/patches/fix-pi-mutex-cond-3.patch    |  28 -
 srcpkgs/musl/template                         |   2 +-
 srcpkgs/ncmpcpp/template                      |   2 +-
 srcpkgs/neatvi/template                       |   4 +-
 srcpkgs/netpbm/template                       |  10 +-
 srcpkgs/networkmanager-qt5/template           |   4 +-
 srcpkgs/nginx/template                        |   3 +-
 srcpkgs/nheko/template                        |   2 +-
 srcpkgs/nncp/template                         |   4 +-
 srcpkgs/nodejs-lts-10-devel                   |   1 +
 srcpkgs/nodejs-lts-10/patches/atomic8.patch   |  14 +
 srcpkgs/nodejs-lts-10/patches/ppc32.patch     |  29 +
 srcpkgs/nodejs-lts-10/patches/ppc64.patch     |  41 +
 srcpkgs/nodejs-lts-10/template                |  96 +++
 srcpkgs/nodejs-lts-10/update                  |   2 +
 srcpkgs/nodejs-lts/template                   |   6 +-
 srcpkgs/nodejs/template                       |   2 +-
 .../noise-repellent/patches/fix-cross.patch   |  28 -
 srcpkgs/noise-repellent/template              |   6 +-
 srcpkgs/nomad/template                        |   6 +-
 srcpkgs/notcurses/template                    |   4 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/nuspell/template                      |   2 +-
 srcpkgs/nv-codec-headers/template             |   2 +-
 srcpkgs/nvidia/INSTALL                        |   3 -
 srcpkgs/nvidia/template                       |   4 +-
 srcpkgs/octave/template                       |  30 +-
 srcpkgs/oidentd/template                      |   4 +-
 srcpkgs/okular/template                       |   4 +-
 srcpkgs/olive/template                        |   2 +-
 srcpkgs/onionshare/template                   |  23 +
 srcpkgs/opam/template                         |   6 +-
 srcpkgs/openbsd-netcat/template               |   6 +-
 srcpkgs/openfortivpn/template                 |   6 +-
 srcpkgs/openimagedenoise/template             |   4 +-
 srcpkgs/openradtool/template                  |   4 +-
 srcpkgs/openttd/template                      |   2 +-
 srcpkgs/osinfo-db/template                    |   4 +-
 srcpkgs/osm2pgsql/template                    |   4 +-
 srcpkgs/oxygen-icons5/template                |   4 +-
 srcpkgs/oxygen/template                       |   4 +-
 srcpkgs/pandoc/template                       |   8 +-
 srcpkgs/papi/template                         |   2 +-
 srcpkgs/papirus-icon-theme/template           |   4 +-
 srcpkgs/pari/patches/makefile.patch           |  36 -
 srcpkgs/pari/template                         |  22 +-
 srcpkgs/pcsclite/patches/python3.patch        |  12 +-
 srcpkgs/pcsclite/template                     |   6 +-
 srcpkgs/peaclock/template                     |   2 +-
 srcpkgs/perl-CGI/template                     |   4 +-
 srcpkgs/perl-IO-Socket-SSL/template           |   4 +-
 srcpkgs/perl-PDF-API2/template                |   4 +-
 srcpkgs/perl-Test-Needs/template              |   6 +-
 srcpkgs/perl-URI/template                     |   6 +-
 srcpkgs/perl-WWW-Mechanize/template           |   4 +-
 srcpkgs/perl-XML-LibXML/template              |   2 +-
 srcpkgs/php/template                          |   2 +-
 .../patches/01-configure_ac-libnm_pc.patch    |  11 +
 .../patches/02-libpurple-nm_state.patch       |  19 +
 srcpkgs/pidgin/template                       |  30 +-
 srcpkgs/pim-data-exporter/template            |   4 +-
 srcpkgs/pimcommon/template                    |   4 +-
 srcpkgs/pioneer/patches/ppc.patch             |   6 +-
 srcpkgs/pioneer/template                      |   4 +-
 srcpkgs/piper/template                        |  12 +-
 srcpkgs/pipewire/template                     |  13 +-
 srcpkgs/plantuml/template                     |   4 +-
 srcpkgs/plasma-browser-integration/template   |   4 +-
 srcpkgs/plasma-desktop/template               |   4 +-
 srcpkgs/plasma-disks/template                 |   4 +-
 srcpkgs/plasma-firewall/template              |   4 +-
 srcpkgs/plasma-framework/template             |   4 +-
 srcpkgs/plasma-integration/template           |   4 +-
 srcpkgs/plasma-nm/template                    |   4 +-
 srcpkgs/plasma-pa/template                    |   4 +-
 srcpkgs/plasma-sdk/template                   |   4 +-
 srcpkgs/plasma-systemmonitor/template         |   4 +-
 srcpkgs/plasma-thunderbolt/template           |   4 +-
 srcpkgs/plasma-vault/template                 |   4 +-
 srcpkgs/plasma-workspace-wallpapers/template  |   4 +-
 srcpkgs/plasma-workspace/template             |   8 +-
 srcpkgs/podman/INSTALL.msg                    |  15 +
 srcpkgs/podman/template                       |   5 +-
 srcpkgs/poedit/template                       |   2 +-
 srcpkgs/polkit-kde-agent/template             |   4 +-
 srcpkgs/portage/template                      |   4 +-
 srcpkgs/postfix/template                      |   6 +-
 srcpkgs/postgis-postgresql12/template         |  14 +-
 srcpkgs/postgis-postgresql13/template         |  14 +-
 srcpkgs/postgis/template                      |  14 +-
 srcpkgs/postgresql/template                   |   8 +-
 srcpkgs/postgresql/update                     |   2 +-
 srcpkgs/postgresql12/template                 |   6 +-
 srcpkgs/postgresql13/template                 |   6 +-
 srcpkgs/powerdevil/template                   |   4 +-
 srcpkgs/pp/template                           |   6 +-
 srcpkgs/prison/template                       |   4 +-
 srcpkgs/prosody/template                      |   5 +-
 srcpkgs/protontricks/template                 |  11 +-
 srcpkgs/protonvpn-cli/template                |  14 +-
 srcpkgs/psiconv-devel                         |   1 +
 srcpkgs/psiconv/template                      |  28 +
 srcpkgs/ptii/patches/fix-installpaths.patch   |  15 +
 srcpkgs/ptii/template                         |  14 +
 srcpkgs/purpose/template                      |   4 +-
 srcpkgs/putty/template                        |   5 +-
 srcpkgs/py3status/template                    |   4 +-
 srcpkgs/pylint/patches/fix-tests.patch        |  13 -
 srcpkgs/pylint/template                       |  24 +-
 .../python-docutils/patches/test-import.patch |  20 +
 srcpkgs/python-docutils/template              |  62 ++
 srcpkgs/python3-PyICU/template                |   2 +-
 srcpkgs/python3-Pygments/template             |   4 +-
 srcpkgs/python3-RPi.GPIO/template             |  24 -
 srcpkgs/python3-aioredis/template             |  12 +-
 srcpkgs/python3-anyio/template                |   6 +-
 srcpkgs/python3-astroid/template              |  14 +-
 srcpkgs/python3-boto3/template                |   4 +-
 srcpkgs/python3-ciso8601/template             |   7 +-
 srcpkgs/python3-distro/template               |   7 +-
 srcpkgs/python3-docutils                      |   1 +
 srcpkgs/python3-docutils/template             |  39 -
 srcpkgs/python3-elementpath/template          |   4 +-
 srcpkgs/python3-flit_core/template            |   4 +-
 srcpkgs/python3-ipython/template              |   4 +-
 srcpkgs/python3-json5/template                |   4 +-
 srcpkgs/python3-jupyter_server/template       |   4 +-
 srcpkgs/python3-jupyterlab_server/template    |   4 +-
 srcpkgs/python3-libarchive-c/template         |   4 +-
 srcpkgs/python3-matplotlib/template           |   4 +-
 srcpkgs/python3-numpy/template                |   4 +-
 srcpkgs/python3-pandas/template               |   4 +-
 srcpkgs/python3-pikepdf/template              |   4 +-
 .../patches/no-versioned-pip.patch            |   3 +-
 srcpkgs/python3-pip/template                  |   4 +-
 srcpkgs/python3-pipx/template                 |   4 +-
 srcpkgs/python3-pyinfra/template              |   4 +-
 srcpkgs/python3-pypandoc/patches/no-pip.patch |  20 -
 srcpkgs/python3-pypandoc/template             |   8 +-
 srcpkgs/python3-pyrsistent/template           |   8 +-
 srcpkgs/python3-pyscard/template              |   6 +-
 srcpkgs/python3-pysol_cards/template          |  12 +-
 srcpkgs/python3-pytest-httpserver/template    |  19 -
 srcpkgs/python3-pytools/template              |   4 +-
 srcpkgs/python3-pyzmq/template                |   4 +-
 srcpkgs/python3-regex/template                |   4 +-
 srcpkgs/python3-scipy/template                |   4 +-
 srcpkgs/python3-smartypants/template          |  19 -
 srcpkgs/python3-tifffile/template             |   4 +-
 srcpkgs/python3-typogrify/template            |  19 -
 srcpkgs/python3-ultrajson/template            |   4 +-
 srcpkgs/python3-urwidtrees/template           |  11 +-
 srcpkgs/python3-usb/template                  |   8 +-
 srcpkgs/python3-uvloop/template               |   4 +-
 srcpkgs/qalculate-gtk/template                |   5 +-
 srcpkgs/qalculate-qt/template                 |  16 -
 srcpkgs/qalculate/template                    |   7 +-
 srcpkgs/qbittorrent/template                  |   4 +-
 srcpkgs/qcas/template                         |   4 +-
 srcpkgs/qqc2-desktop-style/template           |   4 +-
 .../patches/0120-QTBUG-91773.patch            | 372 +++++++++
 .../0200-invalidate-old-v8-cache.patch        |  31 +
 srcpkgs/qt5-webengine/template                |  16 +-
 srcpkgs/qt5-webkit/patches/glib-2.68.patch    |  26 -
 srcpkgs/qt5-webkit/patches/icu-68.patch       | 170 -----
 srcpkgs/qt5-webkit/template                   |   2 +-
 srcpkgs/qt5/template                          |   6 +-
 srcpkgs/qt5ct/INSTALL.msg                     |   1 +
 srcpkgs/qt5ct/template                        |   6 +-
 srcpkgs/qt6-base/template                     |   5 +-
 srcpkgs/qt6-qt5compat/template                |   2 +-
 srcpkgs/qtutilities/template                  |   4 +-
 srcpkgs/qutebrowser/template                  |   4 +-
 srcpkgs/re2c/template                         |   6 +-
 srcpkgs/removed-packages/template             |  15 +-
 srcpkgs/restic/template                       |   4 +-
 srcpkgs/retroarch/template                    |  27 +-
 srcpkgs/ripright/patches/imagemagick7.patch   |  22 -
 srcpkgs/ripright/template                     |  14 +-
 srcpkgs/rpi-imager/template                   |   6 +-
 srcpkgs/rpi-kernel/template                   |  23 +-
 srcpkgs/rpi2-kernel/template                  |  18 +-
 srcpkgs/rpi3-kernel/template                  |  18 +-
 srcpkgs/rpi4-kernel/template                  |  16 +-
 srcpkgs/rspamd/template                       |   2 +-
 srcpkgs/rstudio/template                      |   2 +-
 srcpkgs/rustup/INSTALL.msg                    |   1 +
 srcpkgs/rustup/template                       |   2 +-
 srcpkgs/s/template                            |   6 +-
 srcpkgs/saml2aws/template                     |   4 +-
 srcpkgs/sbcl/template                         |   6 +-
 srcpkgs/sc-im/template                        |   5 +-
 srcpkgs/scribus/template                      |   2 +-
 srcpkgs/scrot/template                        |   8 +-
 srcpkgs/sddm-kcm/template                     |   4 +-
 srcpkgs/sdparm/template                       |   4 +-
 srcpkgs/sequeler/template                     |   4 +-
 srcpkgs/sfeed/template                        |   4 +-
 srcpkgs/sfeed_curses/template                 |   4 +-
 srcpkgs/sftpgo/template                       |  16 -
 srcpkgs/shfmt/template                        |   4 +-
 srcpkgs/shiori/files/shiori/run               |   4 -
 srcpkgs/shiori/template                       |  23 -
 srcpkgs/shotcut/template                      |   4 +-
 srcpkgs/sigil/template                        |   4 +-
 srcpkgs/signon-kwallet-extension/template     |   4 +-
 srcpkgs/sile/template                         |   2 +-
 srcpkgs/sip/template                          |   4 +-
 srcpkgs/skaffold/template                     |   4 +-
 srcpkgs/skopeo/template                       |   4 +-
 srcpkgs/skype/template                        |   4 +-
 srcpkgs/slack-desktop/template                |   4 +-
 srcpkgs/sleuthkit/template                    |   4 +-
 srcpkgs/slop/template                         |   2 +-
 srcpkgs/smplayer/template                     |  12 +-
 .../snowball/patches/libstemmer-library.patch |  33 -
 srcpkgs/snowball/template                     |  60 --
 srcpkgs/sonnet/template                       |   4 +-
 srcpkgs/spdlog/template                       |   8 +-
 srcpkgs/spdx-licenses-list/template           |   6 +-
 srcpkgs/spectacle/template                    |   4 +-
 .../patches/disable-crash-handler.patch       |  14 -
 srcpkgs/spotify-qt/template                   |   4 +-
 srcpkgs/sqlmap/template                       |   4 +-
 .../backport-fix-for-libconfig-1.7.3.patch    | 712 ------------------
 srcpkgs/sslh/template                         |   2 +-
 srcpkgs/stig/template                         |  19 +-
 srcpkgs/strace/template                       |   6 +-
 srcpkgs/stremio-shell/template                |   8 +-
 srcpkgs/stress-ng/template                    |   4 +-
 srcpkgs/sublime-merge-bin/template            |   4 +-
 srcpkgs/svgpart/template                      |   4 +-
 srcpkgs/swaybg/template                       |   6 +-
 srcpkgs/sword/template                        |   2 +-
 srcpkgs/synapse/template                      |   4 +-
 srcpkgs/syncthing/template                    |   4 +-
 srcpkgs/syndication/template                  |   4 +-
 srcpkgs/syntax-highlighting/template          |   4 +-
 srcpkgs/sysprof/patches/build.patch           |  10 +
 srcpkgs/sysprof/patches/musl.patch            | 157 ++++
 srcpkgs/sysprof/template                      |  12 +-
 srcpkgs/systemsettings/template               |   4 +-
 srcpkgs/tageditor/template                    |   4 +-
 srcpkgs/tagparser/template                    |   4 +-
 srcpkgs/tailscale/template                    |   4 +-
 srcpkgs/tectonic/template                     |   2 +-
 .../0003-remove-redundant-extern-c.patch      |  28 +
 srcpkgs/telegram-desktop/template             |   4 +-
 srcpkgs/tepl/template                         |   2 +-
 srcpkgs/terraform/template                    |   4 +-
 srcpkgs/terragrunt/template                   |   4 +-
 srcpkgs/tesseract-ocr/template                |   2 +-
 srcpkgs/texlive/template                      |   2 +-
 srcpkgs/tg_owt/template                       |   2 +-
 srcpkgs/thefuck/template                      |  10 +-
 srcpkgs/thermald/template                     |   4 +-
 srcpkgs/threadweaver/template                 |   4 +-
 srcpkgs/thunderbird-i18n/template             | 112 +--
 srcpkgs/thunderbird/template                  |   4 +-
 srcpkgs/tickr/template                        |   4 +-
 srcpkgs/timeshift/patches/d437358a.patch      |  23 -
 srcpkgs/timeshift/template                    |   2 +-
 srcpkgs/tootle/template                       |  13 -
 srcpkgs/tox/template                          |   4 +-
 srcpkgs/tracker-miners/template               |   2 +-
 srcpkgs/tracker/template                      |   2 +-
 srcpkgs/tracker3-miners/template              |   2 +-
 srcpkgs/tracker3/template                     |   2 +-
 srcpkgs/ugdb/patches/atomicu64.patch          |  28 -
 srcpkgs/ugdb/template                         |   9 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/umbrello/template                     |   4 +-
 srcpkgs/unar/template                         |   2 +-
 srcpkgs/unbound/template                      |   6 +-
 ...01-lib-pwdutils-don-t-use-getlogin-3.patch |  47 --
 .../patches/0001-sulogin-fix-getpasswd.patch  |  26 -
 srcpkgs/util-linux/template                   |   2 +-
 srcpkgs/vala-language-server/template         |   6 +-
 .../vala/patches/disable-unstable-tests.patch |  14 -
 srcpkgs/vala/template                         |  19 +-
 srcpkgs/valabind/template                     |   4 +-
 srcpkgs/valadoc/patches                       |   1 -
 srcpkgs/valadoc/template                      |   8 +-
 srcpkgs/vale/template                         |   4 +-
 srcpkgs/vault-acme/template                   |  20 -
 srcpkgs/vault/template                        |   6 +-
 ...9a67bd5b7523da7678eb5b37f42c0e2759b7.patch |  31 -
 srcpkgs/vc/template                           |   4 +-
 srcpkgs/vips/template                         |   4 +-
 srcpkgs/virtualbox-ose/files/LocalConfig.kmk  |   1 -
 srcpkgs/virtualbox-ose/template               |   5 +-
 srcpkgs/vlc/template                          |   4 +-
 srcpkgs/volctl/template                       |  11 +-
 .../vscode/patches/dont-download-ffmpeg.patch |   4 +-
 srcpkgs/vscode/patches/gulp.patch             |   4 +-
 .../vscode/patches/remove_git_command.patch   |   5 +-
 srcpkgs/vscode/template                       |   4 +-
 srcpkgs/vte3/template                         |   2 +-
 srcpkgs/warzone2100/template                  |   4 +-
 .../patches/be-imagebufferbackend.patch       | 214 ------
 .../webkit2gtk/patches/be-typedarray.patch    |  48 --
 srcpkgs/webkit2gtk/template                   |   7 +-
 srcpkgs/widelands/template                    |   2 +-
 srcpkgs/wine-mono/template                    |   4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch  |   4 +-
 srcpkgs/wine/template                         |   6 +-
 srcpkgs/wob/template                          |   4 +-
 srcpkgs/wps-office/template                   |  12 +-
 srcpkgs/x265/template                         |  13 +-
 srcpkgs/xdg-desktop-portal-kde/template       |   4 +-
 srcpkgs/xdg-utils/template                    |   6 +-
 srcpkgs/xdotool/template                      |   6 +-
 srcpkgs/xerces-c/template                     |   2 +-
 srcpkgs/xeyes/template                        |   6 +-
 srcpkgs/xf86-video-amdgpu/template            |  15 +-
 srcpkgs/xfce4-sensors-plugin/template         |   6 +-
 srcpkgs/xmobar/template                       |   8 +-
 srcpkgs/xorg-server/template                  |   4 +-
 srcpkgs/xpra/template                         |   4 +-
 srcpkgs/xwd/template                          |  10 +-
 srcpkgs/yakuake/template                      |   5 +-
 .../yambar/patches/0001-bar-fix-typo.patch    |  27 -
 srcpkgs/yambar/template                       |   2 +-
 srcpkgs/yaz/template                          |   2 +-
 srcpkgs/youtube-viewer/template               |   4 +-
 srcpkgs/zathura-pdf-mupdf/template            |   9 +-
 srcpkgs/zathura-ps/template                   |   6 +-
 srcpkgs/znc/template                          |   2 +-
 srcpkgs/zola/template                         |   4 +-
 srcpkgs/zoom/template                         |   4 +-
 srcpkgs/zoxide/template                       |   4 +-
 srcpkgs/zsh-autosuggestions/template          |  15 +-
 xbps-src                                      |  18 +-
 861 files changed, 4585 insertions(+), 6000 deletions(-)
 delete mode 100644 srcpkgs/ART/template
 delete mode 120000 srcpkgs/CUnit-devel
 delete mode 100644 srcpkgs/CUnit/template
 delete mode 100644 srcpkgs/CUnit/update
 create mode 100644 srcpkgs/ImageMagick6/template
 create mode 100644 srcpkgs/ImageMagick6/update
 delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
 delete mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
 delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
 delete mode 100644 srcpkgs/abcmidi/template
 delete mode 100644 srcpkgs/alsa_rnnoise/template
 delete mode 120000 srcpkgs/arcan_sdl
 create mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch
 create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch
 create mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch
 create mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch
 create mode 100644 srcpkgs/bomi/template
 create mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
 delete mode 100644 srcpkgs/catgirl/patches/add-missing-include.patch
 delete mode 100644 srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
 create mode 100644 srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
 delete mode 100644 srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
 create mode 100644 srcpkgs/cmake/patches/test-none.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch
 delete mode 100644 srcpkgs/dnsdist/files/dnsdist/run
 delete mode 100644 srcpkgs/dnsdist/template
 delete mode 100644 srcpkgs/dnsdist/update
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
 create mode 100644 srcpkgs/dovecot/INSTALL
 create mode 100644 srcpkgs/dovecot/INSTALL.msg
 create mode 100644 srcpkgs/evilwm/files/evilwm.desktop
 create mode 100644 srcpkgs/filezilla/patches/libtool_tag.patch
 delete mode 100644 srcpkgs/firefox/patches/lto-thin.patch
 create mode 100644 srcpkgs/gespeaker/template
 delete mode 100644 srcpkgs/gi-docgen/template
 delete mode 100644 srcpkgs/giac/patches/pari_2_13.patch
 create mode 100644 srcpkgs/git-lfs/INSTALL.msg
 create mode 100644 srcpkgs/gnome-shell-mousewheel-zoom/template
 delete mode 120000 srcpkgs/gtk4-doc
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch
 delete mode 100644 srcpkgs/hello/template
 delete mode 100644 srcpkgs/icu4lua/patches/icu-68.patch
 create mode 100644 srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
 create mode 100644 srcpkgs/iputils/update
 delete mode 100644 srcpkgs/kdb/patches/kdb-fix-build.patch
 delete mode 100644 srcpkgs/kdb/patches/kdb-mkspecs-path.patch
 create mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/kodi-rpi
 create mode 100644 srcpkgs/kodi-rpi/INSTALL
 create mode 100644 srcpkgs/kodi-rpi/REMOVE
 create mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
 create mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
 create mode 100644 srcpkgs/kodi-rpi/template
 create mode 100644 srcpkgs/kodi-rpi/update
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
 delete mode 100644 srcpkgs/krita/patches/aarch64.patch
 delete mode 100644 srcpkgs/krita/patches/cross.patch
 create mode 100644 srcpkgs/krita/patches/invalid-MimeType.patch
 delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
 delete mode 120000 srcpkgs/libadwaita-demo
 delete mode 120000 srcpkgs/libadwaita-devel
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 delete mode 100644 srcpkgs/libadwaita/template
 delete mode 100644 srcpkgs/libcgroup/empty
 create mode 100644 srcpkgs/libcgroup/update
 delete mode 120000 srcpkgs/libdecor-devel
 delete mode 100644 srcpkgs/libdecor/template
 delete mode 100644 srcpkgs/libe-book/patches/icu-68.patch
 create mode 120000 srcpkgs/libgnt
 delete mode 100644 srcpkgs/libgnt/patches/cross-fix.diff
 delete mode 100644 srcpkgs/libgnt/template
 create mode 120000 srcpkgs/libmagick6
 create mode 120000 srcpkgs/libmagick6-devel
 create mode 120000 srcpkgs/libmagick6-perl
 create mode 120000 srcpkgs/libspa-ffmpeg
 delete mode 120000 srcpkgs/libstemmer
 delete mode 120000 srcpkgs/libstemmer-devel
 delete mode 100644 srcpkgs/libxml2/patches/icu-68.patch
 delete mode 100644 srcpkgs/linux-base/template
 delete mode 100644 srcpkgs/linux4.19/templateu
 create mode 100644 srcpkgs/lynx/update
 create mode 100644 srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
 create mode 100644 srcpkgs/meson/patches/fix-unittest.patch
 create mode 100644 srcpkgs/mu/template
 create mode 120000 srcpkgs/mu4e
 delete mode 100644 srcpkgs/mu4e/template
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
 delete mode 100644 srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
 create mode 120000 srcpkgs/nodejs-lts-10-devel
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
 create mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
 create mode 100644 srcpkgs/nodejs-lts-10/template
 create mode 100644 srcpkgs/nodejs-lts-10/update
 delete mode 100644 srcpkgs/noise-repellent/patches/fix-cross.patch
 delete mode 100644 srcpkgs/nvidia/INSTALL
 create mode 100644 srcpkgs/onionshare/template
 delete mode 100644 srcpkgs/pari/patches/makefile.patch
 create mode 100644 srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
 create mode 100644 srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
 create mode 100644 srcpkgs/podman/INSTALL.msg
 create mode 120000 srcpkgs/psiconv-devel
 create mode 100644 srcpkgs/psiconv/template
 create mode 100644 srcpkgs/ptii/patches/fix-installpaths.patch
 create mode 100644 srcpkgs/ptii/template
 delete mode 100644 srcpkgs/pylint/patches/fix-tests.patch
 create mode 100644 srcpkgs/python-docutils/patches/test-import.patch
 create mode 100644 srcpkgs/python-docutils/template
 delete mode 100644 srcpkgs/python3-RPi.GPIO/template
 create mode 120000 srcpkgs/python3-docutils
 delete mode 100644 srcpkgs/python3-docutils/template
 delete mode 100644 srcpkgs/python3-pypandoc/patches/no-pip.patch
 delete mode 100644 srcpkgs/python3-pytest-httpserver/template
 delete mode 100644 srcpkgs/python3-smartypants/template
 delete mode 100644 srcpkgs/python3-typogrify/template
 delete mode 100644 srcpkgs/qalculate-qt/template
 create mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
 create mode 100644 srcpkgs/qt5ct/INSTALL.msg
 delete mode 100644 srcpkgs/ripright/patches/imagemagick7.patch
 create mode 100644 srcpkgs/rustup/INSTALL.msg
 delete mode 100644 srcpkgs/sftpgo/template
 delete mode 100644 srcpkgs/shiori/files/shiori/run
 delete mode 100644 srcpkgs/shiori/template
 delete mode 100644 srcpkgs/snowball/patches/libstemmer-library.patch
 delete mode 100644 srcpkgs/snowball/template
 delete mode 100644 srcpkgs/spotify-qt/patches/disable-crash-handler.patch
 delete mode 100644 srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
 create mode 100644 srcpkgs/sysprof/patches/build.patch
 create mode 100644 srcpkgs/sysprof/patches/musl.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
 delete mode 100644 srcpkgs/timeshift/patches/d437358a.patch
 delete mode 100644 srcpkgs/tootle/template
 delete mode 100644 srcpkgs/ugdb/patches/atomicu64.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
 delete mode 100644 srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
 delete mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch
 delete mode 120000 srcpkgs/valadoc/patches
 delete mode 100644 srcpkgs/vault-acme/template
 delete mode 100644 srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
 delete mode 100644 srcpkgs/yambar/patches/0001-bar-fix-typo.patch

diff --git a/README.md b/README.md
index 320365ef921a..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,17 @@ For bootstrapping additionally:
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
 
-`xbps-src` requires [a utility to chroot](#chroot-methods) and bind mount existing directories
+`xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports
-multiple utilities to accomplish this task.
+multiple utilities to accomplish this task:
+
+ - `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
+ - `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
+ - `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
 
 > NOTE: `xbps-src` does not allow building as root anymore. Use one of the chroot
-methods.
+methods shown above.
 
 <a name="quick-start"></a>
 ### Quick start
@@ -95,8 +100,6 @@ Alternatively, packages can be installed with the `xi` utility, from the `xtools
 
 #### xbps-uunshare(1) (default)
 
-XBPS utility that uses `user_namespaces(7)` (part of xbps, default without `-t` flag).
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -109,11 +112,6 @@ options it will fail with `EINVAL (Invalid argument)`.
 
 #### xbps-uchroot(1)
 
-XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
-
-> NOTE: This is the only method that implements functionality of `xbps-src -t`, therefore the
-flag ignores the choice made in configuration files and enables `xbps-uchroot`.
-
 This utility requires these Linux kernel options:
 
 - CONFIG\_NAMESPACES
@@ -140,16 +138,6 @@ If for some reason it's erroring out as `ERROR clone (Operation not permitted)`,
 your user is a member of the required `group` and that `xbps-uchroot(1)` utility has the
 proper permissions and owner/group as explained above.
 
-#### bwrap(1)
-
-bubblewrap, sandboxing tool for unprivileged users that uses
-user namespaces or setuid.
-See <https://github.com/containers/bubblewrap>.
-
-#### ethereal
-
-Destroys host system it runs on. Only useful for one-shot containers, i.e docker (used with CI).
-
 <a name="install-bootstrap"></a>
 ### Install the bootstrap packages
 
@@ -436,8 +424,11 @@ To use xbps-src in your Linux distribution use the following instructions. Let's
     $ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
     $ export PATH=~/XBPS/usr/bin:$PATH
 
-If `xbps-uunshare` does not work because of lack of `user_namespaces(7)` support,
-try other [chroot methods](#chroot-methods).
+If your system does not support `user namespaces`, a privileged group is required to be able to use
+`xbps-uchroot(1)` with xbps-src, by default it's set to the `xbuilder` group, change this to your desired group:
+
+    # chown root:<group> ~/XBPS/usr/bin/xbps-uchroot.static
+    # chmod 4750 ~/XBPS/usr/bin/xbps-uchroot.static
 
 Clone the `void-packages` git repository:
 
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..f533212b7daf 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -254,9 +254,6 @@ _vcompletion() {
 		bash) vinstall "$file" 0644 $_bash_completion_dir "${cmd}" ;;
 		fish) vinstall "$file" 0644 $_fish_completion_dir "${cmd}.fish" ;;
 		zsh) vinstall "$file" 0644 $_zsh_completion_dir "_${cmd}" ;;
-		*)
-			msg_red "$pkgver: vcompletion: unknown shell ${shell}"
-			return 1
-			;;
+		*) msg_red "$pkgver: vcompletion: unknown shell ${shell}" ;;
 	esac
 }
diff --git a/common/shlibs b/common/shlibs
index 0304180a8c0d..7f0560d2bad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -141,7 +141,7 @@ librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
-libxlsxwriter.so.2.1 libxlsxwriter-1.1.0_1
+libxlsxwriter.so.1 libxlsxwriter-1.0.0_1
 libfuse.so.2 fuse-2.8.1_1
 libfuse3.so.3 fuse3-3.1.0_1
 libXext.so.6 libXext-1.0.5_1
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.67 icu-libs-67.1_1
+libicui18n.so.67 icu-libs-67.1_1
+libicudata.so.67 icu-libs-67.1_1
+libicutu.so.67 icu-libs-67.1_1
+libicuuc.so.67 icu-libs-67.1_1
+libicutest.so.67 icu-libs-67.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant.so.1 enchant-1.4.2_1
@@ -886,6 +886,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
 libraw.so.20 libraw-0.20.2_1
 libraw_r.so.20 libraw-0.20.2_1
+libkritaversion.so.21 krita-4.4.5_1
+libkritaglobal.so.21 krita-4.4.5_1
+libkritaplugin.so.21 krita-4.4.5_1
+libkritawidgetutils.so.21 krita-4.4.5_1
+libkritawidgets.so.21 krita-4.4.5_1
+libkritastore.so.21 krita-4.4.5_1
+libkritaodf.so.21 krita-4.4.5_1
+libkritaflake.so.21 krita-4.4.5_1
+libkritabasicflakes.so.21 krita-4.4.5_1
+libkritapigment.so.21 krita-4.4.5_1
+libkritacommand.so.21 krita-4.4.5_1
+libkritalibbrush.so.21 krita-4.4.5_1
+libkritapsd.so.21 krita-4.4.5_1
+libkritacolor.so.21 krita-4.4.5_1
+libkritacolord.so.21 krita-4.4.5_1
+libkritaimage.so.21 krita-4.4.5_1
+libkritaui.so.21 krita-4.4.5_1
+libkritaimpex.so.21 krita-4.4.5_1
+libkritalibkis.so.21 krita-4.4.5_1
+libkritaqml.so.21 krita-4.4.5_1
+libkritatextlayout.so.21 krita-4.4.5_1
+libkritatext.so.21 krita-4.4.5_1
+libkritalibkra.so.21 krita-4.4.5_1
+libkritalibpaintop.so.21 krita-4.4.5_1
+libkritametadata.so.21 krita-4.4.5_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
@@ -1957,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
 libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.199 x265-3.5_1
+libx265.so.192 x265-3.4_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
 libqwt.so.6 qwt-6.1.3_1
@@ -2588,7 +2613,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.16 libfilezilla-0.31.1_1
+libfilezilla.so.15 libfilezilla-0.30.0_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2971,7 +2996,7 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1
 libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
-libqalculate.so.22 libqalculate-3.20.1_1
+libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
@@ -3094,8 +3119,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.52.so.0 libvala-0.52.0_1
-libvaladoc-0.52.so.0 libvaladoc-0.52.0_1
+libvala-0.50.so.0 libvala-0.50.0_1
+libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3486,7 +3511,6 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
@@ -3498,7 +3522,7 @@ libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
 libretro-gtk-1.so.0 retro-gtk-1.0.0_1
 libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.7 fmt-7.0.3_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
 libtls.so.20 libtls-3.2.4_1
@@ -3654,11 +3678,11 @@ libmhash.so.2 mhash-0.9.9.9_1
 librlottie.so.0 rlottie-0.0.20160709_1
 libfstrm.so.0 fstrm-0.5.0_1
 libfreecell-solver.so.0 libfreecell-solver-5.10.0_1
-libknot.so.12 libknot-3.1.0_1
+libknot.so.11 libknot-3.0.0_1
 libdnssec.so.8 libknot-3.0.0_1
-libzscanner.so.4 libknot-3.1.0_1
+libzscanner.so.3 libknot-2.8.2_1
 libkres.so.9 knot-resolver-4.0.0_1
-libnsl.so.3 libnsl-2.0.0_1
+libnsl.so.2 libnsl-1.2.0_1
 libbcc.so.0 bcc-0.10.0_1
 libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
@@ -3981,7 +4005,6 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
-libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
@@ -4004,5 +4027,3 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
-libstemmer.so.2 libstemmer-2.1.0_1
-libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/common/travis/license.lst b/common/travis/license.lst
index 488cc8b2d0a4..d6c530d2afd9 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -72,40 +72,30 @@ CAL-1.0
 CATOSL-1.1
 CC-BY-1.0
 CC-BY-2.0
-CC-BY-2.5-AU
 CC-BY-2.5
 CC-BY-3.0-AT
-CC-BY-3.0-DE
-CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-3.0
 CC-BY-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
-CC-BY-NC-3.0-DE
 CC-BY-NC-3.0
 CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
-CC-BY-NC-ND-3.0-DE
 CC-BY-NC-ND-3.0-IGO
 CC-BY-NC-ND-3.0
 CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
-CC-BY-NC-SA-2.0-FR
-CC-BY-NC-SA-2.0-UK
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
-CC-BY-NC-SA-3.0-DE
-CC-BY-NC-SA-3.0-IGO
 CC-BY-NC-SA-3.0
 CC-BY-NC-SA-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
-CC-BY-ND-3.0-DE
 CC-BY-ND-3.0
 CC-BY-ND-4.0
 CC-BY-SA-1.0
@@ -114,7 +104,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
-CC-BY-SA-3.0-DE
 CC-BY-SA-3.0
 CC-BY-SA-4.0
 CC-PDDC
@@ -123,7 +112,6 @@ CDDL-1.0
 CDDL-1.1
 CDL-1.0
 CDLA-Permissive-1.0
-CDLA-Permissive-2.0
 CDLA-Sharing-1.0
 CECILL-1.0
 CECILL-1.1
@@ -297,7 +285,6 @@ NGPL
 NIST-PD-fallback
 NIST-PD
 NLOD-1.0
-NLOD-2.0
 NLPL
 NOSL
 NPL-1.0
@@ -351,7 +338,6 @@ OLDAP-2.7
 OLDAP-2.8
 OML
 OPL-1.0
-OPUBL-1.0
 OSET-PL-2.1
 OSL-1.0
 OSL-1.1
diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0f37ba4625dd..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,6 +1,6 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.25
+version=0.0.24b
 revision=1
 wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=97a0e4268b439b5e88d56f66869d702764251a98ef1465af94b57127342a0cb5
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 93e90e139b4f..20688372e42c 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,116 @@
+--- a/build/premake/premake5.lua
++++ b/build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
+--- /dev/null
++++ b/source/lib/sysdep/arch/ppc64/ppc64.cpp
+@@ -0,0 +1,50 @@
++/* Copyright (C) 2012 Wildfire Games
++ * Copyright (C) 2018 Raptor Engineering, LLC
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files (the
++ * "Software"), to deal in the Software without restriction, including
++ * without limitation the rights to use, copy, modify, merge, publish,
++ * distribute, sublicense, and/or sell copies of the Software, and to
++ * permit persons to whom the Software is furnished to do so, subject to
++ * the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included
++ * in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/*
++ * routines specific to POWER
++ */
++
++#include "precompiled.h"
++
++#include "lib/sysdep/cpu.h"
++
++intptr_t cpu_AtomicAdd(volatile intptr_t* location, intptr_t increment)
++{
++	return __sync_fetch_and_add(location, increment);
++}
++
++bool cpu_CAS(volatile intptr_t* location, intptr_t expected, intptr_t newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++bool cpu_CAS64(volatile i64* location, i64 expected, i64 newValue)
++{
++	return __sync_bool_compare_and_swap(location, expected, newValue);
++}
++
++const char* cpu_IdentifierString()
++{
++	return "IBM POWER"; // TODO
++}
+--- a/source/lib/byte_order.h	2021-02-28 16:59:34.041933978 +0100
++++ b/source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- a/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:30.331118437 +0100
++++ b/source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
+ 	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
+ 	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
++	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
+ 
+ #ifdef NDEBUG
+ 	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- a/source/lib/sysdep/arch.h	2021-02-28 18:45:28.761727174 +0100
++++ b/source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
 --- a/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 +++ b/libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
 @@ -27,10 +27,7 @@
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 66083eaae67a..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,6 +1,6 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.25
+version=0.0.24b
 revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=592eab37c1a1588e87b1f22d328fd6ca84ba47f32219f9e0fc4bbf67e745430f
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 lib32disabled=yes
 
diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template
deleted file mode 100644
index d84f8c8aa9af..000000000000
--- a/srcpkgs/ART/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'ART'
-pkgname=ART
-version=1.9.3
-revision=1
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel
- libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel"
-depends="desktop-file-utils hicolor-icon-theme"
-short_desc="Fork of RawTherapee with additional features"
-maintainer="notthewave <winklbauer_m@zoho.eu>"
-license="GPL-3.0-or-later"
-homepage="https://bitbucket.org/agriggio/art/wiki/Home"
-distfiles="https://bitbucket.org/agriggio/art/downloads/${pkgname}-${version}.tar.xz"
-checksum=4e3bacec3f7a01ee72cc565b3f522bb5939c47f0279ac44f85bb344a000bcb8e
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index a00a75fe709d..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=13
+revision=12
 build_style=gnu-configure
 configure_args="--disable-update-checker --with-alsa --with-ffms2
  --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index a0bc5780731d..241daec8743e 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,8 +1,8 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.2
-revision=2
-archs="x86_64 aarch64"
+version=2021.1.3
+revision=1
+archs="i686 x86_64"
 wrksrc="clion-${version}"
 depends="jetbrains-jdk-bin giflib libXtst"
 short_desc="Smart cross-platform IDE for C and C++"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=2cabf03c825f15cb9216a936aa20c2caef8a0c3624556292b60f9a25ca22a146
+checksum=bf2f627bab06fa94b32f205f15a67659a7bb38e078847cb6e3f811098dc13897
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -25,39 +25,25 @@ desc_option_bundled_gdb="Install bundled GDB"
 desc_option_bundled_lldb="Install bundled LLDB"
 
 post_extract() {
-	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
 	rm -rf lib/pty4j-native/linux/ppc64le
 
-
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf lib/pty4j-native/linux/aarch64
+			rm -rf bin/fsnotifier
+			rm -rf bin/clion.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf lib/pty4j-native/linux/x86
+			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
 			;;
-		aarch64)
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/clion64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86-64
-			rm -rf plugins/performanceTesting/bin/libyjpagent64.so
 			rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_amd64.so
 			;;
 	esac
diff --git a/srcpkgs/CUnit-devel b/srcpkgs/CUnit-devel
deleted file mode 120000
index cd42858e4b11..000000000000
--- a/srcpkgs/CUnit-devel
+++ /dev/null
@@ -1 +0,0 @@
-CUnit
\ No newline at end of file
diff --git a/srcpkgs/CUnit/template b/srcpkgs/CUnit/template
deleted file mode 100644
index f142f9ee64c9..000000000000
--- a/srcpkgs/CUnit/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'CUnit'
-pkgname=CUnit
-version=2.1.3
-revision=1
-_distver="${version%.*}-${version##*.}"
-wrksrc="CUnit-${_distver}"
-build_style=gnu-configure
-configure_args="--disable-console"
-hostmakedepends="autoconf automake libtool"
-short_desc="Unit Testing Framework for C"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="LGPL-2.0-or-later"
-homepage="http://cunit.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/cunit/CUnit/${_distver}/CUnit-${_distver}.tar.bz2"
-checksum=f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214
-
-pre_configure() {
-	vsed -e 's@./configure@:@' -i bootstrap
-	sh bootstrap .
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/doc  ${DESTDIR}/usr/share
-}
-
-CUnit-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/share/man/man3
-		vmove usr/share/doc
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/CUnit/update b/srcpkgs/CUnit/update
deleted file mode 100644
index 90b1a7c7efd5..000000000000
--- a/srcpkgs/CUnit/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 1703283ee7d2..4edce3b0d86f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -17,7 +17,7 @@ makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
  libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel
  ocl-icd-devel pango-devel libopenjpeg2-devel"
 short_desc="Package for display and interactive manipulation of images"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
new file mode 100644
index 000000000000..7fbcb1d3150c
--- /dev/null
+++ b/srcpkgs/ImageMagick6/template
@@ -0,0 +1,86 @@
+# Template file for 'ImageMagick6'
+pkgname=ImageMagick6
+version=6.9.12.12
+revision=2
+_majorver=${version%.*}
+_patchver=${version##*.}
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
+build_style=gnu-configure
+configure_args="--without-autotrace --with-wmf=yes
+ --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
+ --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
+ --with-magick-plus-plus --with-modules --enable-shared --with-rsvg
+ --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel
+ libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel
+ libwmf-devel ocl-icd-devel pango-devel"
+short_desc="Package for display and interactive manipulation of images"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
+license="ImageMagick"
+homepage="https://www.imagemagick.org/"
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d
+
+keep_libtool_archives=yes
+conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
+
+subpackages="libmagick6 libmagick6-devel"
+
+conflicts="ImageMagick>=0"
+
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic)
+	configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor"
+	hostmakedepends+=" perl"
+	subpackages+=" libmagick6-perl"
+fi
+
+pre_configure() {
+	autoreconf -if
+}
+
+do_check() {
+	# Disable failing checks
+	sed -i '/validate-formats/d' Makefile
+
+	make check
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense NOTICE
+}
+
+libmagick6_package() {
+	short_desc="ImageMagick6 low-level image manipulation libraries"
+	pkg_install() {
+		vmove "usr/lib/libMagick*.so.*"
+		vmove "usr/lib/ImageMagick*"
+		vmove "usr/share/ImageMagick*"
+	}
+}
+
+libmagick6-devel_package() {
+	depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel
+	 libgomp-devel libltdl-devel libmagick6>=${version}_${revision}"
+	short_desc="ImageMagick6 low-level image manipulation development files"
+	conflicts="libmagick-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/doc
+		vmove "usr/bin/*-config"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.la"
+		vmove "usr/share/man/man1/*-config.1"
+	}
+}
+
+libmagick6-perl_package() {
+	short_desc="ImageMagick6 perl library bindings"
+	pkg_install() {
+		vmove usr/lib/perl5
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
new file mode 100644
index 000000000000..6a9f7e46a667
--- /dev/null
+++ b/srcpkgs/ImageMagick6/update
@@ -0,0 +1 @@
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
-             return None
-
-+    def _manga_title_from_attributes(self, attributes):
-+        if self.lang_code in attributes['title']:
-+            return attributes['title'][self.lang_code]
-+        elif 'en' in attributes['title']:
-+            return attributes['title']['en']
-+
-+        else:
-+            lang_code_alt_name = None
-+            en_alt_name = None
-+
-+            for alt_title in attributes['altTitles']:
-+                if not lang_code_alt_name and self.lang_code in alt_title:
-+                    lang_code_alt_name = alt_title['en']
-+
-+                if not en_alt_name and 'en' in alt_title:
-+                    en_alt_name = alt_title['en']
-+
-+            return lang_code_alt_name or en_alt_name
-+
-+
-     def get_manga_data(self, initial_data):
-         """
-         Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
-         attributes = resp_json['data']['attributes']
-
-         # FIXME: Should probably be lang_code, but the API returns weird stuff
--        data['name'] = html.unescape(attributes['title']['en'])
-+        _name = self._manga_title_from_attributes(attributes)
-+        data['name'] = html.unescape(_name)
-+        assert data['name'] is not None
-
-         for relationship in resp_json['relationships']:
-             if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
-         elif attributes['status'] == 'hiatus':
-             data['status'] = 'hiatus'
-
--        # FIXME: lang_code
--        data['synopsis'] = html.unescape(attributes['description']['en'])
-+        if self.lang_code in attributes['description']:
-+            data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+        elif 'en' in attributes['description']:
-+            # Fall back to english synopsis
-+            data['synopsis'] = html.unescape(attributes['description']['en'])
-+        else:
-+            logger.warn('{}: No synopsis', data['name'])
-+
-
-         data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
-             if result['type'] != 'manga':
-                 continue
-
--            results.append(dict(
--                slug=result['id'],
--                # FIXME: lang_code
--                name=result['attributes']['title']['en'],
--            ))
-+            name = self._manga_title_from_attributes(result['attributes'])
-+
-+            if name:
-+                results.append(dict(
-+                    slug=result['id'],
-+                    # FIXME: lang_code
-+                    name=name,
-+                ))
-+            else:
-+                logger.warn("ignoring result {}, missing name".format(result['id']))
-
-         return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..a8d21545b64c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.30.0
+version=0.29.2
 revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -9,11 +9,11 @@ makedepends="gtk+3-devel libhandy1-devel"
 depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
  python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
  python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf"
+ python3-pure-protobuf"
 checkdepends="appstream-glib desktop-file-utils"
 short_desc="Online/offline manga reader for GNOME"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
-distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
+checksum=20e78e8fbdabc926d9ead44efcc8ec9e16807745fbda8502451de99a4e864ec4
diff --git a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
index 3000ca0ed3d5..b7304474f777 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc/musl-ppc-secureplt.patch
@@ -2,8 +2,8 @@ Imported from https://github.com/LuaJIT/LuaJIT/pull/486.
 
 This fixes crashes on ppc-musl, as musl only supports secureplt.
 
---- a/src/lj_dispatch.c
-+++ b/src/lj_dispatch.c
+--- src/lj_dispatch.c
++++ src/lj_dispatch.c
 @@ -56,6 +56,18 @@ static const ASMFunction dispatch_got[] = {
  #undef GOTFUNC
  #endif
@@ -33,8 +33,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
  }
  
  #if LJ_HASJIT
---- a/src/lj_dispatch.h
-+++ b/src/lj_dispatch.h
+--- src/lj_dispatch.h
++++ src/lj_dispatch.h
 @@ -66,6 +66,21 @@ GOTDEF(GOTENUM)
  };
  #endif
@@ -66,8 +66,8 @@ This fixes crashes on ppc-musl, as musl only supports secureplt.
    ASMFunction got[LJ_GOT__MAX];		/* Global offset table. */
  #endif
  #if LJ_HASJIT
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -59,7 +59,12 @@
  |.define ENV_OFS,	8
  |.endif
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
index 7c865859da92..8feb60601dd8 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/add-ppc64-support.patch
@@ -26,8 +26,8 @@ Author: Rodrigo R. Galvao <rosattig@br.ibm.com>
 
 diff --git dynasm/dasm_ppc.lua dynasm/dasm_ppc.lua
 index f73974d..a4ad70b 100644
---- a/dynasm/dasm_ppc.lua
-+++ b/dynasm/dasm_ppc.lua
+--- dynasm/dasm_ppc.lua
++++ dynasm/dasm_ppc.lua
 @@ -257,9 +257,11 @@ map_op = {
    addic_3 =	"30000000RRI",
    ["addic._3"] = "34000000RRI",
@@ -52,8 +52,8 @@ index f73974d..a4ad70b 100644
    end),
 diff --git src/Makefile src/Makefile
 index 6b73a89..cc50bae 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -453,7 +453,16 @@ ifeq (ppc,$(TARGET_LJARCH))
      DASM_AFLAGS+= -D GPR64
    endif
@@ -74,8 +74,8 @@ index 6b73a89..cc50bae 100644
      DASM_ARCH= ppc64
 diff --git src/host/buildvm_asm.c src/host/buildvm_asm.c
 index ffd1490..6bb995e 100644
---- a/src/host/buildvm_asm.c
-+++ b/src/host/buildvm_asm.c
+--- src/host/buildvm_asm.c
++++ src/host/buildvm_asm.c
 @@ -140,18 +140,14 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n,
  #else
  #define TOCPREFIX ""
@@ -111,8 +111,8 @@ index ffd1490..6bb995e 100644
    fprintf(ctx->fp, "\t.text\n");
 diff --git src/lj_arch.h src/lj_arch.h
 index d609b37..53bc651 100644
---- a/src/lj_arch.h
-+++ b/src/lj_arch.h
+--- src/lj_arch.h
++++ src/lj_arch.h
 @@ -269,10 +269,18 @@
  #if LJ_TARGET_CONSOLE
  #define LJ_ARCH_PPC32ON64	1
@@ -149,8 +149,8 @@ index d609b37..53bc651 100644
  #endif
 diff --git src/lj_ccall.c src/lj_ccall.c
 index 5c252e5..b891591 100644
---- a/src/lj_ccall.c
-+++ b/src/lj_ccall.c
+--- src/lj_ccall.c
++++ src/lj_ccall.c
 @@ -369,21 +369,97 @@
  #elif LJ_TARGET_PPC
  /* -- PPC calling conventions --------------------------------------------- */
@@ -376,8 +376,8 @@ index 5c252e5..b891591 100644
  #if LJ_TARGET_MIPS64
 diff --git src/lj_ccall.h src/lj_ccall.h
 index 59f6648..bbf309f 100644
---- a/src/lj_ccall.h
-+++ b/src/lj_ccall.h
+--- src/lj_ccall.h
++++ src/lj_ccall.h
 @@ -86,10 +86,23 @@ typedef union FPRArg {
  #elif LJ_TARGET_PPC
  
@@ -404,8 +404,8 @@ index 59f6648..bbf309f 100644
  typedef intptr_t GPRArg;
 diff --git src/lj_ccallback.c src/lj_ccallback.c
 index 846827b..eb7f445 100644
---- a/src/lj_ccallback.c
-+++ b/src/lj_ccallback.c
+--- src/lj_ccallback.c
++++ src/lj_ccallback.c
 @@ -61,8 +61,24 @@ static MSize CALLBACK_OFS2SLOT(MSize ofs)
  
  #elif LJ_TARGET_PPC
@@ -513,8 +513,8 @@ index 846827b..eb7f445 100644
      if (ctr->size <= 4 &&
 diff --git src/lj_ctype.h src/lj_ctype.h
 index 0c220a8..105865b 100644
---- a/src/lj_ctype.h
-+++ b/src/lj_ctype.h
+--- src/lj_ctype.h
++++ src/lj_ctype.h
 @@ -153,7 +153,7 @@ typedef struct CType {
  
  /* Simplify target-specific configuration. Checked in lj_ccall.h. */
@@ -526,8 +526,8 @@ index 0c220a8..105865b 100644
  
 diff --git src/lj_def.h src/lj_def.h
 index 2d8fff6..381d6f5 100644
---- a/src/lj_def.h
-+++ b/src/lj_def.h
+--- src/lj_def.h
++++ src/lj_def.h
 @@ -71,7 +71,11 @@ typedef unsigned int uintptr_t;
  #define LJ_MAX_IDXCHAIN	100		/* __index/__newindex chain limit. */
  #define LJ_STACK_EXTRA	(5+2*LJ_FR2)	/* Extra stack space (metamethods). */
@@ -542,8 +542,8 @@ index 2d8fff6..381d6f5 100644
  #define LJ_MIN_GLOBAL	6		/* Min. global table size (hbits). */
 diff --git src/lj_frame.h src/lj_frame.h
 index 19c49a4..c666418 100644
---- a/src/lj_frame.h
-+++ b/src/lj_frame.h
+--- src/lj_frame.h
++++ src/lj_frame.h
 @@ -210,6 +210,15 @@ enum { LJ_CONT_TAILCALL, LJ_CONT_FFI_CALLBACK };  /* Special continuations. */
  #define CFRAME_OFS_MULTRES	408
  #define CFRAME_SIZE		384
@@ -562,8 +562,8 @@ index 19c49a4..c666418 100644
  #define CFRAME_OFS_NRES		468
 diff --git src/lj_target_ppc.h src/lj_target_ppc.h
 index c5c991a..f0c8c94 100644
---- a/src/lj_target_ppc.h
-+++ b/src/lj_target_ppc.h
+--- src/lj_target_ppc.h
++++ src/lj_target_ppc.h
 @@ -30,8 +30,13 @@ enum {
  
    /* Calling conventions. */
@@ -603,8 +603,8 @@ index c5c991a..f0c8c94 100644
    PPCI_BC = 0x40800000,
 diff --git src/vm_ppc.dasc src/vm_ppc.dasc
 index b4260eb..abb381e 100644
---- a/src/vm_ppc.dasc
-+++ b/src/vm_ppc.dasc
+--- src/vm_ppc.dasc
++++ src/vm_ppc.dasc
 @@ -22,35 +22,40 @@
  |// GPR64   64 bit registers (but possibly 32 bit pointers, e.g. PS3).
  |//         Affects reg saves, stack layout, carry/overflow/dot flags etc.
diff --git a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
index f4e760b73836..ab6771110f90 100644
--- a/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
+++ b/srcpkgs/LuaJIT/files/patches/ppc64/fix-vm-jit-ppc64.patch
@@ -1,5 +1,5 @@
---- a/src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
-+++ b/src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
+--- src/vm_ppc.dasc	2019-06-03 19:41:50.214671731 +0200
++++ src/vm_ppc.dasc	2019-06-03 19:44:40.229686143 +0200
 @@ -2774,7 +2774,7 @@
    |
    |->vm_exit_handler:
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 5b8ab1beda11..9fbc72cbe4e7 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -38,7 +38,7 @@ post_patch() {
 
 	for i in ${FILESDIR}/patches/${patchdir}/*.patch; do
 		msg_normal "patching: $i\n"
-		patch -sNp1 -i ${i}
+		patch -sNp0 -i ${i}
 	done
 }
 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..86b2abf205c3 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,8 +5,8 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
-version=0.3.4.1
-revision=2
+version=0.3.4
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -20,7 +20,7 @@ configure_args="
 make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 depends="zenity"
@@ -33,7 +33,7 @@ homepage="https://openrct2.io"
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="01f286dce2a9668fb87f403a0f53880936d3013fd502f32f9bb1217236c28225
+checksum="755529c797b94279e683b77ffbcfcfe901cca2fff817431632a23019ac95c6ca
  b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip replays.zip"
@@ -53,9 +53,6 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	# for icu mass-rebuild
-	hostmakedepends+=" enchant2 libxml2 webkit2gtk libharfbuzz"
-	hostmakedepends+=" libnuspell libpsl"
 	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..48aa4abe0b69 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-ggplot2'
 pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.3
 revision=1
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=45c29e2348dbd195bbde1197a52db7764113e57f463fd3770fb899acc33423cc
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..b7420242f6a4 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,14 +1,14 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
-version=1.7.3
-revision=1
+version=1.4.6
+revision=3
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
-checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
+checksum=633f67da5bd7bcb611764e4f478b0da050d22a715bbcbdd67aed0300dcef6fd6
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2a3cb67d3fec..0eda3df81f3f 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
deleted file mode 100644
index 5c62275830ab..000000000000
--- a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
-From: Ethan Lee <flibitijibibo@gmail.com>
-Date: Wed, 11 Aug 2021 09:59:43 -0400
-Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
- fullscreen mode
-
----
- src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
-index 025dd30ee..451d33b76 100644
---- a/src/video/wayland/SDL_waylandwindow.c
-+++ b/src/video/wayland/SDL_waylandwindow.c
-@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
- 
-             /* Foolishly do what the compositor says here. If it's wrong, don't
-              * blame us, we were explicitly instructed to do this.
-+             *
-+             * UPDATE: Nope, we can't actually do that, the compositor may give
-+             * us a completely stateless, sizeless configure, with which we have
-+             * to enforce our own state anyway.
-              */
--            window->w = width;
--            window->h = height;
-+            if (width != 0 && height != 0) {
-+                window->w = width;
-+                window->h = height;
-+            }
- 
-             /* This part is good though. */
-             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index b7c1db667dc4..9013c2e73e21 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.16
+version=2.0.14
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,14 +12,13 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="https://www.libsdl.org/"
-changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
-distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+homepage="http://www.libsdl.org/"
+distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
 
 # Package build options
-build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -72,13 +71,6 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
-if [ "$build_option_pipewire" ]; then
-	configure_args+=" --enable-pipewire"
-	makedepends+=" pipewire-devel"
-else
-	configure_args+=" --disable-pipewire"
-fi
-
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -90,8 +82,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
-	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared"
+	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
-revision=1
+version=3.1.12a
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
deleted file mode 100644
index 4ae9ee619e3a..000000000000
--- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
-From: John Helmert III <jchelmert3@posteo.net>
-Date: Tue, 29 Jun 2021 21:29:12 -0500
-Subject: [PATCH] libfmt >=8.0.0 compatibility
-
----
- include/util/format.hpp | 4 ++++
- src/modules/clock.cpp   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 288d8f0cd..543a100fb 100644
---- a/Waybar-0.9.7/include/util/format.hpp
-+++ b/Waybar-0.9.7/include/util/format.hpp
-@@ -35,7 +35,11 @@ namespace fmt {
-             // The rationale for ignoring it is that the only reason to specify
-             // an alignment and a with is to get a fixed width bar, and ">" is
-             // sufficient in this implementation.
-+#if FMT_VERSION < 80000
-             width = parse_nonnegative_int(it, end, ctx);
-+#else
-+            width = detail::parse_nonnegative_int(it, end, -1);
-+#endif
-           }
-           return it;
-         }
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 22bedc783..82c570102 100644
---- a/Waybar-0.9.7/src/modules/clock.cpp
-+++ b/Waybar-0.9.7/src/modules/clock.cpp
-@@ -196,6 +196,9 @@ template <>
- struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   auto format(const waybar_time& t, FormatContext& ctx) {
-+#if FMT_VERSION >= 80000
-+	auto& tm_format = specs;
-+#endif
-     return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
-   }
- };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 699c4baddb59..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.9.7
-revision=2
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
diff --git a/srcpkgs/abcmidi/template b/srcpkgs/abcmidi/template
deleted file mode 100644
index c5dd100bfbc3..000000000000
--- a/srcpkgs/abcmidi/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'abcmidi'
-pkgname=abcmidi
-version=2021.06.27
-revision=1
-wrksrc=${pkgname}
-build_style=gnu-configure
-short_desc="Utilites for working with ABC files"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-2.0-or-later"
-homepage="https://ifdo.ca/~seymour/runabc/top.html"
-distfiles="https://ifdo.ca/~seymour/runabc/abcMIDI-${version}.zip"
-checksum=08ecbdda0ab81551f4d319e2db71f81f566b21adba252d8793c70a137bc0dd38
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 9750c4c941a0..0778d446920a 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=86c76db4f02e5b5687c385c96a2631042db22e0e095cf3939887ed049ed27738
+checksum=352c1a809b8c0dd3006f96274c0af1cfcefaf4e4f74088b4c2854b9e7c657122
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index ddc4f95d8449..95f8894703a9 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,9 +1,9 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons"
 makedepends="kio-devel kcontacts-devel kmime-devel akonadi-mime-devel prison-devel
  libkleo-devel grantlee5-devel grantleetheme-devel"
 short_desc="Libraries and daemons to implement Contact Management in Akonadi"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+checksum=45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index a2b72606fac3..e293f601b16b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a8e49d801634a2b00f973fa1051c08826f581899d696fb38241f39439f5696dd
+checksum=f1850013b560deb468f4657ebdd7cee62661d657b95b4e43944f5a5d3f5ab7be
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index d3dd0188e275..793eaa4db509 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=33fa3f1ced279192b3aec99666c47765fa33e464478f012752968e8b847d8121
+checksum=86fd97d1367dfa7509881f1d6c76080b1926b7d873b5d36526fe0907895812d4
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index e08be40d821d..d3505141631d 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=690b267946bf8fba2272f1ed26c4f4c43e977875205502ff68c19c2e0744a191
+checksum=089a25c95107f1d104a825abade59de278d4aaa29ab4052339eb82e4d5f267c0
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index fa3c6189d6ea..4a2bc233f3ca 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3af1481e3df9b8b1ba1a3aab1c0b657a799aab77ad8a20d4115f213d81fd766a
+checksum=d047ef7b4a338dd31bce4d22b5c4bc8c9e87d1067d581afaa8549e7074f1c69b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index e55cfaf89ebf..f96f9e09634d 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=7a697427e198fcef19718a73f0c4459467e2a3bdc880f63ab46de41802464f62
+checksum=f076dba29986961c7774118b4730c8035820e423d792f15644fa09ad1d55d26e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0aaa952d4daa..e0e7f9a849c5 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,11 +1,11 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.9.0
+version=0.8.0
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="freetype-devel fontconfig-devel libxcb-devel libxkbcommon-devel"
+makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXi libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6d3aaac9e0477f903563b6fb26e089118407cdbfe952a1e2ffbf4e971b7062b3
+checksum=e450ff4ceafdf4894d82f2f22ca93b422ffd1283f876d44cf744e4ed3bc0eaf6
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alsa_rnnoise/template b/srcpkgs/alsa_rnnoise/template
deleted file mode 100644
index 2472f31b7a6b..000000000000
--- a/srcpkgs/alsa_rnnoise/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'alsa_rnnoise'
-pkgname=alsa_rnnoise
-version=1.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="rnnoise-devel alsa-lib-devel"
-short_desc="RNNoise based noise removal plugin for ALSA"
-maintainer="Arsen Arsenović <arsen@aarsen.me>"
-license="GPL-3.0-only"
-homepage="https://git.sr.ht/~arsen/alsa_rnnoise"
-distfiles="https://git.sr.ht/~arsen/alsa_rnnoise/archive/v${version}.tar.gz"
-checksum=88dc6e062539e75f80e90126934e3629ca766a99e3a7b7d0cd4e6013d295bc9d
diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index c6b356b54976..b04df1bf0003 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -14,6 +14,22 @@ Index: llvm-project/llvm/CMakeLists.txt
  set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
  
  set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
+Index: pal/cmake/Modules/AmdCmakeHelper.cmake
+===================================================================
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
++++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
+@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
+ 
+-    if (CMAKE_BUILD_TYPE AND
+-        NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
+-        message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-    endif()
+-
+     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+         set(CMAKE_BUILD_TYPE_DEBUG ON)
+         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
 --- a/xgl/CMakeLists.txt
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index c01b288f2328..a6c3daf619db 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q3.3
+version=2021.Q3.1
 revision=1
-_llpc_commit=9a3ae083e7400d38790dd9a251731b20aae0d31a
-_xgl_commit=b135615f415f318c4e910e4b4f44aba2b5ea2e7f
-_pal_commit=f2be9e29a870305e2b2ff1641c0f230725685ef3
-_llvm_project_commit=d3ad9a01687d912773e4fe802ddc85143b7e66d1
+_llpc_commit=b2e47a684ac1ba9bcddfc87afa9d2fffffd15c06
+_xgl_commit=682b4a3d4a49b2db24ad10b31ff192d03ecca097
+_pal_commit=ad699adac6f9f331bbc454050f6b40d1549ce752
+_llvm_project_commit=84bf997c8b569e551ef73d39cf391e72d2f6c682
 _spvgen_commit=051b6997c7c34f1167cfd400e3205ed6d4b728ef
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="bfb86692af5c47d4d1b9b1b669fa67626dbd6145804b4deda7d20cc688cd403f
- 241b9f62ae01284468f45b3f690303c884bfaddeade19f6041e617f20485789b
- 5608e53d87d55fd4667d67a4293d9a17ef99a769bf41eeacd99ac9b829ee4412
- ca9f60cdeb22c1befcab88bf527f8318265dbda1cb5149421bf38c4fcc0f91a7
- 01a07a396604ec3634e9369d3dbb5d198e7b58fbcde54e0cf06e55bd95e77a90
+checksum="22a361b6ddd7e90e2c7e032997aa75fd3ff09b7d8747f858878ab2b55abef6fa
+ 7850d290692354cc8fff2bb9733483d70a95a4bd6895fe9c8d9f039520a1025d
+ 1fbc572c0de2dc773fafad5ace4a2c754157cfd44f93ee89b2cbad015f0fd5dc
+ 6ed1a198f1967dfed7d81ea28a65ce03042fe3b72bf48a119a111ab487a5abf9
+ 3cf1858a373e8d1eda486e1fc668f0552f80408ba395ac5e7038ec6271513bd3
  1718847a0476f47dede1f061a61dcbd00861bd998f4257c54ec92e866e94f8f2
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..28a6600f6492 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=7
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index b218b76a2e37..c6d522451779 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.7
+version=2.12.6
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=269831b60d0008d3f4420293971ebbe951b04ee72f8359f2cc3ee89e649b1705
+checksum=371b15e07e450ca117ef75dea58353721d67f09b3af4f328d5858ba7b2a13777
 CFLAGS="-Wno-error"
 
 do_install() {
diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 63a3e256df33..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,14 +1,13 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.4
-revision=2
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
 hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
-depends="python3-regex python3-pypandoc gspell iso-codes libhandy1
- webkit2gtk"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 31bf6e62eec5..f436db94479c 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -1,18 +1,17 @@
 # Template file for 'arcan'
 pkgname=arcan
 version=0.6.0.1
-revision=2
+revision=1
 build_wrksrc=src
 build_style=cmake
 make_cmd=make
 configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri
- -DHYBRID_SDL=On
  $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')"
 hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -75,11 +74,3 @@ arcan-devel_package() {
 		vmove usr/include
 	}
 }
-
-arcan_sdl_package() {
-	short_desc+=" - SDL platform server binary"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/arcan_sdl
-	}
-}
diff --git a/srcpkgs/arcan_sdl b/srcpkgs/arcan_sdl
deleted file mode 120000
index fb6a95edcfe5..000000000000
--- a/srcpkgs/arcan_sdl
+++ /dev/null
@@ -1 +0,0 @@
-arcan
\ No newline at end of file
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..b3fb850ee8ce 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,8 +1,8 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.9
+version=6.8
 revision=1
-_commit="945c8f288077565fe3de32c6ac0cb50e286722e4"
+_commit="1734fac4105106e02219834d330fa9eb0ceef3cd"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1665ae95f762..a0b94ffa2be3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd7daf89f1821edcb03bbe41344f85198f5709135a8d4d273fe7ba611230f522
+checksum=6cfd49512080c84982574e36f85daeff1ae1287b7bae74cff46e4503d4cc70af
 
 do_check() {
 	cd build
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 6a83617ae25a..214c8a5fc61c 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=345fb419e5ef64dc23e3cfda3a8d9877fa915cd0b5d8dee0517d4326be148be7
+checksum=adb8afbbe73d89e07dee77a4ee0d9553b4611ee5e69effe9e0d9881b54abb1e0
 
 do_check() {
 	cd build
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
 # Template file for 'avidemux'
 pkgname=avidemux
 version=2.7.6
-revision=2
+revision=1
 # Can't be compiled for aarch64, arm* or mips*
 archs="x86_64* i686*"
 wrksrc="${pkgname}_${version}"
diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 8502d6e2979a..fc5700641bca 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.5.1
+version=0.5.0
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -9,14 +9,14 @@ short_desc="Native, fast starting Clojure interpreter for scripting"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
-_sci_commit=46204fbce012f4495d691520ce545ad277a86747
+_sci_commit=5ed2190f3c97de6d30f3aba96362bf6c68e95e90
 _babashka_curl_commit=cf71c8ae24a4f8ec85663970f4b8a3f63a0c1a6b
-_babashka_nrepl_commit=47c64227afe869ed9dfba739077c50b06650c0aa
+_babashka_nrepl_commit=bd1ce0cbc0861350a4a36e9c31ef79fa0c7cff84
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=4fdf33c0243ff646dfa91c4454844a33e0f025b0
+_process_commit=4c6699d06b49773d3e5c5b4c11d3334fb78cc996
 _pods_commit=de4c3610c9ef3879370d01b7202a9f3a9d056f6e
-_deps_clj_commit=af343527c1481845f9138ea8919a26e04e7cd447
-_fs_commit=5339280ee1006de65b6461ed08cfdf2a7b7a4b10
+_deps_clj_commit=985e5ca7f9cb123f86a0747aded1ee98e1f3deee
+_fs_commit=1beb91cd5f352d1e3a914c94e7ec25a2644b07e5
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
  https://github.com/babashka/babashka.curl/archive/${_babashka_curl_commit}.tar.gz
@@ -26,15 +26,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/babashka/pods/archive/${_pods_commit}.tar.gz
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz"
-checksum="accc5d70ae87534e33eca6bcbc1743f70c16511c28942981592e2aee328ba770
- 8e370e9a478cde133f8e1ead2e732706a0546549a207e54b725f574ecfe0fcf2
+checksum="485866c1aeb9c5e17707f67a0efcd39404aa8b75fa7f34f49b0b4353beb5b412
+ 86a95fa5966d1aae1632102a2c8dd4fe6bea41533eaa07943f116a2ac3d727f7
  e318e4563a278488a0a2d91b2d7c56bd8a0e2be8b895d91435822a047e85c0c3
- 470866fb6c72aa03ead79179ab6113aa2d41b0950dd127b82c95d9a599dd0126
+ 83e3e122bdca4449649199ea7916a46423ac29c0611b7fc7d0f84557105bfdcc
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- dcb999043dfc807a1ebfae99027b4434e726f647aa52fbd70ed58202d907d39a
+ 83816c89603bc1b1c938eca9ab941222e51cbe1ab110329717e13760c0f4d1eb
  9fdd931dc27ff8831dcd456ee5382eda5698cb4d34bf4a72ded0c8c7ac6f74bc
- 043176fdf641b9788a956779bcd4df91591d137bc04f87fec137def0e8dc037a
- a9b4463e39c196dc2bb74a383639eeacdfe5634e445ba051bae458346965dee9"
+ 836d73dbcd05b370911eb9b6dc9a99c8047173b9a96650efe53da0e7c4ac3a2d
+ b9977751969dbe38403f235fe757a8d1a07d539857d01b31f4bea24e4d58e7e3"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"
 
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index c6fc3833c0e2..413568589e69 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=9ef1dc516900e3a4c3e7f382b3cd34df36dcbb4f089d494a28b30b5072a6c741
+checksum=b4be933e232c9461bed4fe10c3facbaff41b50a02523e8c70218f809d722f0cc
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 8394cdec0d3e..106a032faebc 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=81b4459a77c7b75c3a0d8d70fba50ba122f02ed32945522ecc4a6b15c8a6914d
+checksum=e4c1df50e8218d2e227a31499c4016cde546b13361e46994ed82fb8c13768d96
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 74fdd0259725..cbdb9de0abcf 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,10 +1,10 @@
 # Template file for 'bcc'
 pkgname=bcc
-version=0.21.0
-revision=4
+version=0.20.0
+revision=2
 wrksrc="bcc"
 build_style=cmake
-configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
+configure_args="-DREVISION=${version}"
 hostmakedepends="flex python3"
 makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
  ncurses-devel python3-devel zlib-devel"
@@ -12,12 +12,8 @@ short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bcc"
-# use a newer libbpf to fix compile issues on various targets
-# you should be able to drop this for the next update
-distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz
- https://github.com/libbpf/libbpf/archive/506a544834573905ada61da8e00f54b04f0caf43.tar.gz"
-checksum="5323e2a505f6868976d973a234202332ec25dc36f0bf7c118c23fc24f6147215
- e1db8edc20997270a7d7c4d6e5d881abb941828601f113866ebb4073168c1f87"
+distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"
+checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b
 python_version="3"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,9 +23,6 @@ fi
 post_extract() {
 	sed -i '/tests/d' CMakeLists.txt  # break on musl
 	sed -i 's/<error.h>/<errno.h>/' examples/cpp/KModRetExample.cc
-	# use a newer libbpf with fixes
-	rm -rf src/cc/libbpf
-	mv ../libbpf* src/cc/libbpf
 }
 bcc-tools_package() {
 	short_desc+=" - tools"
diff --git a/srcpkgs/benchmark/template b/srcpkgs/benchmark/template
index b75095dfb136..08885019296b 100644
--- a/srcpkgs/benchmark/template
+++ b/srcpkgs/benchmark/template
@@ -1,6 +1,6 @@
 # Template file for 'benchmark'
 pkgname=benchmark
-version=1.5.6
+version=1.5.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DBENCHMARK_ENABLE_GTEST_TESTS=OFF
@@ -10,7 +10,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/google/benchmark/"
 distfiles="https://github.com/google/benchmark/archive/v${version}.tar.gz"
-checksum=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102
+checksum=3bff5f237c317ddfd8d5a9b96b3eede7c0802e799db520d38ce756a2a46a18a0
 
 benchmark-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index c10b2b2e89d0..e696669a3cba 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=40f19b3b66737f4dabd49f05450d91fc850d27e9b4abdeb112c7d9e70d997881
+checksum=95b8c00cbc7b0eda9af8e9d934384148a1e25a329d529fb0d6b0cac00623f8e1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index eba7615720f4..7b1ba307cb65 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a85b2a5601c50f6b3ade1396624d008ad405de4bda81f77ccaddd55837d700a2
+checksum=909ab90b3a3868314d37c2223458b047011a6a4baae0f0d2183bc9b380fce65d
 
 do_check() {
 	cd build
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index f53a74678d11..ec5ad3933afd 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,14 +1,14 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20210808
+version=20210621
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="https://www.crufty.net/help/sjg/bmake.html"
-distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=40a5860812091a0613b9542637a0f4aa05f38889e2a1f889f0e827feb41357d2
+homepage="http://www.crufty.net/help/sjg/bmake.html"
+distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
+checksum=aa97b2f602fd31a71336ce97c54a1c74c2b3437fb24100830c1fff15cbd9ff3e
 python_version=3
 
 do_configure() {
diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch
new file mode 100644
index 000000000000..3b224fd76a73
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch
@@ -0,0 +1,32 @@
+libavutil/audioconvert.h is gone in ffmpeg3.x
+
+--- a/src/mpv/audio/filter/af_lavcac3enc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavcac3enc.c	2016-09-22 19:52:47.730132367 +0200
+@@ -26,7 +26,6 @@
+ #include <assert.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/intreadwrite.h>
+ #include <libavutil/common.h>
+ #include <libavutil/bswap.h>
+--- a/src/mpv/audio/out/ao_lavc.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/out/ao_lavc.c	2016-09-22 19:54:50.291163189 +0200
+@@ -25,7 +25,6 @@
+ #include <limits.h>
+ 
+ #include <libavutil/common.h>
+-#include <libavutil/audioconvert.h>
+ 
+ #include "config.h"
+ #include "options/options.h"
+--- a/src/mpv/audio/filter/af_lavrresample.c	2015-05-20 11:31:58.000000000 +0200
++++ b/src/mpv/audio/filter/af_lavrresample.c	2016-09-22 19:57:13.539200765 +0200
+@@ -28,7 +28,6 @@
+ #include <assert.h>
+ 
+ #include <libavutil/opt.h>
+-#include <libavutil/audioconvert.h>
+ #include <libavutil/common.h>
+ #include <libavutil/samplefmt.h>
+ #include <libavutil/mathematics.h>
diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch
new file mode 100644
index 000000000000..fefd786df654
--- /dev/null
+++ b/srcpkgs/bomi/patches/ffmpeg4.patch
@@ -0,0 +1,195 @@
+source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa
+
+diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp
+index 77b1df41c5..5365525c48 100644
+--- a/src/bomi/video/ffmpegfilters.hpp
++++ b/src/bomi/video/ffmpegfilters.hpp
+@@ -6,7 +6,7 @@
+ extern "C" {
+ #include <video/mp_image_pool.h>
+ #include <video/img_format.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libpostproc/postprocess.h>
+ }
+ #include "enum/deintmethod.hpp"
+diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c
+index b322982566..d1991e1d37 100644
+--- a/src/mpv/audio/out/ao_lavc.c
++++ b/src/mpv/audio/out/ao_lavc.c
+@@ -156,8 +156,8 @@ static int init(struct ao *ao)
+         ac->buffer_size =
+             ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200;
+     }
+-    if (ac->buffer_size < FF_MIN_BUFFER_SIZE)
+-        ac->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     ac->buffer = talloc_size(ac, ac->buffer_size);
+ 
+     // enough frames for at least 0.25 seconds
+diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c
+index 05c694702d..fb6206bc01 100644
+--- a/src/mpv/common/av_common.c
++++ b/src/mpv/common/av_common.c
+@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
+     if (size) {
+         av_free(avctx->extradata);
+         avctx->extradata_size = 0;
+-        avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
++        avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+         if (!avctx->extradata)
+             return -1;
+         avctx->extradata_size = size;
+@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
+     avctx->channel_layout           = st->channel_layout;
+     avctx->bits_per_coded_sample    = st->bits_per_coded_sample;
+     // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards.
+-    avctx->stream_codec_tag         = st->stream_codec_tag;
++    avctx->codec_tag         = st->codec_tag;
+ }
+ 
+ // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it.
+diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c
+index 2a01bee380..9c97c97a88 100644
+--- a/src/mpv/common/encode_lavc.c
++++ b/src/mpv/common/encode_lavc.c
+@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx,
+             if (!(*bytebuf = stream_open(buf, ctx->global))) {
+                 MP_WARN(ctx, "%s: could not open '%s', "
+                        "disabling 2-pass encoding at pass 2\n", prefix, buf);
+-                stream->codec->flags &= ~CODEC_FLAG_PASS2;
++                stream->codec->flags &= ~AV_CODEC_FLAG_PASS2;
+                 set_to_avdictionary(ctx, dictp, "flags", "-pass2");
+             } else {
+                 struct bstr content = stream_read_complete(*bytebuf, NULL,
+@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening video encoder: %s [%s]\n",
+                 ctx->vc->long_name, ctx->vc->name);
+ 
+-        if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream)
+         MP_INFO(ctx, "Opening audio encoder: %s [%s]\n",
+                 ctx->ac->long_name, ctx->ac->name);
+ 
+-        if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) {
++        if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+             stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
+             MP_WARN(ctx, "\n\n"
+                        "           ********************************************\n"
+diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c
+index 943fb1d8af..6f438249ad 100644
+--- a/src/mpv/demux/demux_lavf.c
++++ b/src/mpv/demux/demux_lavf.c
+@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
+         // Disable file-extension matching with normal checks
+         .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
+         .buf_size = 0,
+-        .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
++        .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE),
+     };
+     if (!avpd.buf)
+         return -1;
+diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c
+index 22b111b0ce..62cd90ef7e 100644
+--- a/src/mpv/demux/packet.c
++++ b/src/mpv/demux/packet.c
+@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len)
+ {
+     assert(len <= dp->len);
+     dp->len = len;
+-    memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++    memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ }
+ 
+ void free_demux_packet(struct demux_packet *dp)
+diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c
+index ffd56350b6..2589faf4ec 100644
+--- a/src/mpv/video/decode/vd_lavc.c
++++ b/src/mpv/video/decode/vd_lavc.c
+@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
+         mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads);
+     }
+ 
+-    avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0;
+-    avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0;
++    avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0;
++    avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0;
+ 
+     if (lavc_param->show_all) {
+-#ifdef CODEC_FLAG2_SHOW_ALL
+-        avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
++#ifdef AV_CODEC_FLAG2_SHOW_ALL
++        avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only?
+ #endif
+-#ifdef CODEC_FLAG_OUTPUT_CORRUPT
+-        avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
++#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT
++        avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10
+ #endif
+     }
+ 
+diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c
+index 3a6903b7fd..895e0952a5 100644
+--- a/src/mpv/video/out/vo_lavc.c
++++ b/src/mpv/video/out/vo_lavc.c
+@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
+         goto error;
+ 
+     vc->buffer_size = 6 * width * height + 200;
+-    if (vc->buffer_size < FF_MIN_BUFFER_SIZE)
+-        vc->buffer_size = FF_MIN_BUFFER_SIZE;
++    if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
++        vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
+     if (vc->buffer_size < sizeof(AVPicture))
+         vc->buffer_size = sizeof(AVPicture);
+ 
+@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet)
+ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet)
+ {
+     struct priv *vc = vo->priv;
+-    if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) {
+-        if (!frame)
+-            return 0;
+-        memcpy(vc->buffer, frame, sizeof(AVPicture));
+-        MP_DBG(vo, "got pts %f\n",
+-               frame->pts * (double) vc->stream->codec->time_base.num /
+-                            (double) vc->stream->codec->time_base.den);
+-        packet->size = sizeof(AVPicture);
+-        return packet->size;
+-    } else {
+-        int got_packet = 0;
+-        int status = avcodec_encode_video2(vc->stream->codec, packet,
+-                                           frame, &got_packet);
+-        int size = (status < 0) ? status : got_packet ? packet->size : 0;
+-
+-        if (frame)
+-            MP_DBG(vo, "got pts %f; out size: %d\n",
+-                   frame->pts * (double) vc->stream->codec->time_base.num /
+-                   (double) vc->stream->codec->time_base.den, size);
+-
+-        if (got_packet)
+-            encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
+-        return size;
+-    }
++    int got_packet = 0;
++    int status = avcodec_encode_video2(vc->stream->codec, packet,
++            frame, &got_packet);
++    int size = (status < 0) ? status : got_packet ? packet->size : 0;
++
++    if (frame)
++        MP_DBG(vo, "got pts %f; out size: %d\n",
++                frame->pts * (double) vc->stream->codec->time_base.num /
++                (double) vc->stream->codec->time_base.den, size);
++
++    if (got_packet)
++        encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream);
++    return size;
+ }
+ 
+ static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi)
+
diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch
new file mode 100644
index 000000000000..b953146e2571
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-cxx14.patch
@@ -0,0 +1,67 @@
+--- a/src/bomi/bomi.pro	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/bomi.pro	2016-09-22 20:03:57.452315214 +0200
+@@ -19,6 +19,7 @@
+ }
+ 
+ QMAKE_CXXFLAGS_CXX11 = -std=c++1y
++CONFIG += c++14
+ 
+ contains(QMAKE_CXX, clang++) {
+ QMAKE_CXXFLAGS += -Wno-missing-braces
+--- a/src/bomi/misc/filenamegenerator.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.cpp	2016-09-22 20:06:10.523355518 +0200
+@@ -51,8 +51,8 @@
+         };
+         get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; };
+ 
+-        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); };
+-        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->unix); };
++        get[u"%UNIX%"_q]     = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); };
++        get[u"%UNIX_MS%"_q]  = [] (const FileNameGenerator *g) { return _N(g->_unix); };
+         return get;
+     }();
+     auto ret = func.value(ph);
+--- a/src/bomi/misc/filenamegenerator.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/misc/filenamegenerator.hpp	2016-09-22 20:07:13.762375106 +0200
+@@ -11,7 +11,7 @@
+     QTime start, end;
+     QString mediaName;
+     Mrl mrl;
+-    quint64 unix = 0;
++    quint64 _unix = 0;
+ };
+ 
+ #endif // FILENAMEGENERATOR_HPP
+--- a/src/bomi/player/mainwindow_p.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.cpp	2016-09-22 20:08:20.590396090 +0200
+@@ -910,7 +910,7 @@
+     g.dateTime = QDateTime::currentDateTime();
+     g.start = QTime::fromMSecsSinceStartOfDay(e.time());
+     g.end = end.isNull() ? g.start : end;
+-    g.unix = QDateTime::currentMSecsSinceEpoch();
++    g._unix = QDateTime::currentMSecsSinceEpoch();
+     g.mrl = e.mrl();
+     g.mediaName = e.media()->name();
+     return g;
+--- a/src/bomi/player/mainwindow_p.hpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/player/mainwindow_p.hpp	2016-09-22 20:09:18.003414361 +0200
+@@ -101,7 +101,7 @@
+ 
+     struct {
+         QDate date; QTime time, position;
+-        quint64 unix = 0;
++        quint64 _unix = 0;
+         QMap<QString, std::function<QString(void)>> get;
+     } ph;
+     QTimer waiter, hider, dialogWorkaround;
+--- a/src/bomi/dialog/encoderdialog.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/dialog/encoderdialog.cpp	2016-09-22 20:05:18.684339670 +0200
+@@ -255,7 +255,7 @@
+ {
+     if (d->size.isEmpty())
+         return tr("No video stream exists.");
+-    d->g.unix = QDateTime::currentMSecsSinceEpoch();
++    d->g._unix = QDateTime::currentMSecsSinceEpoch();
+     d->g.dateTime = QDateTime::currentDateTime();
+     d->g.start = d->ui.a->time();
+     d->g.end = d->ui.b->time();
diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch
new file mode 100644
index 000000000000..1de63a16b819
--- /dev/null
+++ b/srcpkgs/bomi/patches/fix-sysctl_h.patch
@@ -0,0 +1,22 @@
+--- a/src/bomi/os/mac.mm	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/mac.mm	2021-01-16 10:51:12.701668482 +0100
+@@ -274,7 +274,7 @@
+ 
+ 
+ #ifdef Q_OS_MAC
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <mach/mach_host.h>
+ #include <mach/task.h>
+ #include <libproc.h>
+--- a/src/bomi/os/x11.cpp	2015-05-20 11:31:58.000000000 +0200
++++ b/src/bomi/os/x11.cpp	2021-01-16 10:51:04.559292267 +0100
+@@ -15,7 +15,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/types.h>
+ #include <xcb/xcb.h>
+ #include <xcb/randr.h>
diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template
new file mode 100644
index 000000000000..4cab853148a5
--- /dev/null
+++ b/srcpkgs/bomi/template
@@ -0,0 +1,35 @@
+# Template file for 'bomi'
+pkgname=bomi
+version=0.9.11
+revision=17
+build_style=configure
+configure_args="--disable-systemd --release --prefix=/usr"
+# does not build using py3.8 because of waf issues
+hostmakedepends="python pkg-config curl perl which"
+makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel
+ libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel
+ xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel
+ qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel
+ fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel
+ samba-devel libchardet-devel"
+depends="qt5-quickcontrols"
+short_desc="Powerful and easy-to-use Qt5 multimedia player"
+maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://bomi-player.github.io/"
+changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt"
+distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz"
+checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e
+nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio
+
+pre_configure() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) # There is no <sys/sysctl.h> in musl libc
+			sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \
+			-i ${wrksrc}/src/bomi/os/x11.cpp
+			;;
+	esac
+}
+do_install() {
+	make DEST_DIR=${DESTDIR} install
+}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 61749aaeba72..d1dd74577e7a 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=5
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 3e467bc2928a..f200409ddb2f 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.13.0
-revision=3
+revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"  # needs root to run
@@ -13,7 +13,6 @@ license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
 checksum=a5203e5c73277c87d624f32e8ee394d4c5e2c2810bde8314c1b015c9d810a6bb
-nostrip=yes  # needs to read own symbol table
 
 post_install() {
 	# clashes with bcc-tools
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index fd529e18cd51..8318f83f05bb 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b69b4e74594b49e3cee62fbffab875442f6b9d0d6432972b800c82eb2de87dc
+checksum=cff20c1605a09a85966a5d03f323fd8ad6b94828c347b68cbc874d896e0c7dbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f74fc4bcc987..96ebe37136ac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4407aed678f85ab600b63337553ee9cd5f967bbffd383c351add1c0746ab273d
+checksum=049a26594de966a215ea4546bbf76a2395def31a637eb26820258d7c0962408c
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 8bbecf811d11..af4ae3d5be8a 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7d792b7f97e6d5854d81b4098edefd62a8e5b309e471ab39ada679a52ecf9fac
+checksum=2b8c20e9bea767ed796e0ba5adee30812c73591c000bbf79855d504303f120e4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 76d56520dac2..53e15ed6ff03 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 812aaa4ce5c5..5eef88f60e8f 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,6 +1,6 @@
 # Template file for 'broot'
 pkgname=broot
-version=1.6.3
+version=1.1.10
 revision=1
 build_style=cargo
 short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://dystroy.org/broot/"
 distfiles="https://github.com/Canop/broot/archive/v${version}.tar.gz"
-checksum=c7ef696a9da162a4338790a9e021eddedcc9a5be321bfea5cc2c33b2b2a53472
+checksum=f40e63cf8bcf7d70a42d528696fe0355ff5a4a80cfd654593dabdd866613bc60
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
new file mode 100644
index 000000000000..22ba4b27683c
--- /dev/null
+++ b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
@@ -0,0 +1,56 @@
+From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.com>
+Date: Mon, 7 Jun 2021 17:38:46 +0200
+Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
+
+There's a report that a system with 4.19 kernel fails boot because
+device scan exits with error. This is because zoned support is compiled
+in btrfs-progs but not in kernel.
+
+To make new progs and old kernels work, do a fallback when the zoned
+ioctl is not available, as if it were a non-zoned device. There is no
+other option, but this is safe at least for the device scan that would
+not error out. Any unaligned writes to a zoned device will fail as
+expected.
+
+Issue: #376
+Signed-off-by: David Sterba <dsterba@suse.com>
+---
+ kernel-shared/zoned.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
+index 2a6892b3c..dc850cd22 100644
+--- a/kernel-shared/zoned.c
++++ b/kernel-shared/zoned.c
+@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
+ 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
+ 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
+-		if (ret) {
+-			error("zoned: ioctl BLKGETZONESZ failed (%m)");
+-			exit(1);
++		if (ret < 0) {
++			if (errno == ENOTTY) {
++				/* No kernel support, assuming non-zoned device */
++				zone_size_sector = 0;
++			} else {
++				error("zoned: ioctl BLKGETZONESZ failed: %m");
++				exit(1);
++			}
+ 		}
+ 	} else {
+ 		zone_size_sector = 0;
+@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
+ 
+ 	ret = ioctl(fd, BLKREPORTZONE, rep);
+ 	if (ret) {
+-		error("zoned: ioctl BLKREPORTZONE failed (%m)");
++		if (errno == ENOTTY) {
++			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
++			exit(1);
++		}
++		error("zoned: ioctl BLKREPORTZONE failed: %m");
+ 		exit(1);
+ 	}
+ 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index ef62f0b7ccba..eeca5301f9fe 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.13.1
-revision=1
+version=5.12.1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
+checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index fdce7ee04c7b..9864444d2fda 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20210808
+version=20210619
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83
+checksum=acdd6080dcf935732a08ec8e8c4c161c666cd56d8c490739c6dbb6267a498c0e
 
 alternatives="
  yacc:yacc:/usr/bin/byacc
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index 0091cc87f62e..9f81b95462cf 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -1,17 +1,15 @@
 # Template file for 'c-ares'
 pkgname=c-ares
-version=1.17.2
+version=1.17.1
 revision=1
 build_style=gnu-configure
-checkdepends="iana-etc"
 short_desc="C library that performs DNS requests and name resolves asynchronously"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://c-ares.haxx.se/"
 changelog="https://c-ares.haxx.se/changelog.html"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d
-make_check=ci-skip # segfaults only on CI
+checksum=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40
 
 pre_configure() {
 	export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=?/}
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 1730e476dcae..49fbc8086d29 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=97597e0e97539693f0532f915c7c33f51e016c1e091f92ff660a7db06133bea1
+checksum=49dd1e8ece78f9b65247615d83ed8f4095a8d0f61815a8407aee77ad687c9df6
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index adcd8781dc90..0d69e612e46f 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.21.0
-revision=2
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index a98ca3a95d22..9ecdc3112e5e 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,6 +1,6 @@
 # Template file for 'catfish'
 pkgname=catfish
-version=4.16.2
+version=4.16.0
 revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/catfish/start"
 distfiles="https://archive.xfce.org/src/apps/catfish/${version%.*}/catfish-${version}.tar.bz2"
-checksum=b21a2e151943f0b194d38b17feaaf382187947ed12a02c3d6492afb748012a6b
+checksum=1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
diff --git a/srcpkgs/catgirl/patches/add-missing-include.patch b/srcpkgs/catgirl/patches/add-missing-include.patch
deleted file mode 100644
index 8440919128d4..000000000000
--- a/srcpkgs/catgirl/patches/add-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ui.c
-+++ b/ui.c
-@@ -47,6 +47,7 @@
- #include <unistd.h>
- #include <wchar.h>
- #include <wctype.h>
-+#include <sys/file.h>
- 
- #ifdef __FreeBSD__
- #include <capsicum_helpers.h>
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 337968b71a90..a81b83507026 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.9
+version=1.8
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
@@ -11,5 +11,5 @@ short_desc="TLS-only terminal IRC client"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://git.causal.agency/catgirl/"
-distfiles="https://git.causal.agency/catgirl/snapshot/catgirl-$version.tar.gz"
-checksum=1ce8110a820db10e646dada98d45bdeb7efe2da3248eff70772e54ecb33f54a0
+distfiles="https://git.causal.agency/catgirl/snapshot/$pkgname-$version.tar.gz"
+checksum=2ef69606640f25ca695bc65d0dd9e16f5fa36184feb38d1253a5648dad68776b
diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 3d7443a87dea..542a7215820d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -4,7 +4,7 @@ version=0.19.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://github.com/eqrion/cbindgen"
 distfiles="https://github.com/eqrion/cbindgen/archive/v${version}.tar.gz"
diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 751b37451020..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -1,6 +1,6 @@
 # Template file for 'cc65'
 pkgname=cc65
-version=2.19
+version=2.18
 revision=1
 build_style="gnu-makefile"
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Nathaniel Barragan <nathanielbarragan@gmail.com>"
 license="Zlib"
 homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
-checksum=157b8051aed7f534e5093471e734e7a95e509c577324099c3c81324ed9d0de77
+checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
 disable_parallel_build=yes
 
diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index 2f17130b6638..57076066ef7a 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,6 +1,6 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
-version=0.92
+version=0.91
 revision=1
 build_wrksrc="linux"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
-checksum=7e20c14c265b2753bb052487d6fbff980391ed35f6fca9ece256dce30b6b81fa
+checksum=9df507fc13777e46e97f886c76b05a36c0d26464e1e567173118295127b857ff
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 
 pre_configure() {
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..836aa5995a7d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,8 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.99.39
-revision=2
-wrksrc="${pkgname}_${version}"
+version=0.99.33
+revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
 makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
@@ -13,8 +12,8 @@ short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://github.com/giuspen/cherrytree/releases/download/${version}/cherrytree_${version}.tar.xz"
-checksum=7af0adc2e2edf3f8797ba6b1bcb534f2309ba8297c4b235835ea969bae457d62
+distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
+checksum=0bc743eb8cdf7d29c059d65b62f7143380c77193cc52744962bb9fc4b4d14d29
 configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
  -DBUILD_GTEST:BOOL='OFF'
  -DBUILD_TESTING:BOOL='OFF'"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 644b87e1fd30..3094579cbb67 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.1.5
+version=2.1.2
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=50d1ea421806969b0214acfc5df76d9093ae1b568d00cb7bd7bfd91bb8023387
+checksum=0d17795a499bef2d113953725927305a5fdfccfa1681e1c29bc44a25cee458a3
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index f9ab40f5ac04..7da8a60d903d 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,19 +1,22 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.33.0
+version=2.31.1
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
 
 if [ "$CHROOT_READY" ]; then
-	checkdepends="perl gnupg"
+	hostmakedepends="perl tar"
+else
+	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
 
 do_configure() {
@@ -25,7 +28,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	SKIP_DASHED_BUILT_INS = Yes
+	NO_INSTALL_HARDLINKS=Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -35,8 +38,6 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
-	DEFAULT_TEST_TARGET = prove
-	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -45,19 +46,12 @@ do_configure() {
 		NO_REGEX = Yes
 		EOF
 	fi
-	if ! [ "$CHROOT_READY" ]; then
-		echo "ZLIB_PATH = ${XBPS_MASTERDIR}/usr" >>config.mak
-	fi
 }
 
 do_build() {
 	make ${makejobs} git
 }
 
-do_check() {
-	make test
-}
-
 do_install() {
 	vbin git chroot-git
 }
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e0b48d33537b..f77692c4b4c2 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.3
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..12b30963b7c6 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=3.17.8
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -17,7 +17,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=cdb7b2814995d6f4a9c3b1f0bc1467ed5c3cf2a5e0da1730aaa25a8accafddaf
 
 claws-mail-devel_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch b/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
deleted file mode 100644
index 33f781acf11d..000000000000
--- a/srcpkgs/clazy/patches/0001-Replace-Find-scripts-with-llvm-clang-provided-cmake-.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-From e49e57e1b12440a365a176ccfaded1d00ab0e62a Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Mon, 9 Aug 2021 15:56:40 +0200
-Subject: [PATCH] Replace Find* scripts with llvm/clang provided cmake modules
-
----
- CMakeLists.txt        |  24 +------
- cmake/FindClang.cmake | 130 ---------------------------------
- cmake/FindLLVM.cmake  | 162 ------------------------------------------
- 3 files changed, 3 insertions(+), 313 deletions(-)
- delete mode 100644 cmake/FindClang.cmake
- delete mode 100644 cmake/FindLLVM.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e649bfe..79fd1093 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,10 @@ set(CLAZY_VERSION_PATCH "0")
- set(CLAZY_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}.${CLAZY_VERSION_PATCH}")
- set(CLAZY_PRINT_VERSION "${CLAZY_VERSION_MAJOR}.${CLAZY_VERSION_MINOR}")
- 
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake)
- if (NOT CLAZY_BUILD_WITH_CLANG)
--  find_package(Clang 8.0 MODULE REQUIRED)
-+  find_package(Clang CONFIG REQUIRED)
- 
--  if (CLANG_CLANG-CPP_LIB AND NOT APPLE)
-+  if (TARGET clang-cpp AND NOT APPLE)
-     set(default_use_clang_cpp ON)
-   else()
-     set(default_use_clang_cpp OFF)
-@@ -128,24 +127,7 @@ macro(link_to_llvm name is_standalone)
-     target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-   endif()
- 
--  foreach(llvm_lib ${LLVM_LIBS})
--    if(NOT ${is_standalone} AND NOT APPLE AND NOT MINGW AND NOT MSVC)
--        ## Don't link against LLVMSupport, causes: CommandLine Error: Option 'view-background' registered more than once!
--        if (NOT llvm_lib MATCHES ".*LLVMSupport.*")
--            target_link_libraries(${name} ${llvm_lib})
--        endif()
--    else()
--        target_link_libraries(${name} ${llvm_lib})
--    endif()
--  endforeach()
--
--  foreach(user_lib ${USER_LIBS})
--    target_link_libraries(${name} ${user_lib})
--  endforeach()
--
--  foreach(llvm_system_lib ${LLVM_SYSTEM_LIBS})
--    target_link_libraries(${name} ${llvm_system_lib})
--  endforeach()
-+  target_link_libraries(${name} LLVM)
- 
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-deleted file mode 100644
-index 7a40b2fb..00000000
---- a/cmake/FindClang.cmake
-+++ /dev/null
-@@ -1,130 +0,0 @@
--# Detect Clang libraries
--#
--# Defines the following variables:
--#  CLANG_FOUND                 - True if Clang was found
--#  CLANG_INCLUDE_DIRS          - Where to find Clang includes
--#  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
--#
--#  CLANG_LIBCLANG_LIB          - Libclang C library
--#
--#  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
--#  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
--#  ...
--#
--#  CLANG_LIBS                  - All the Clang C++ libraries
--#
--# Uses the same include and library paths detected by FindLLVM.cmake
--#
--# See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
--
--#=============================================================================
--# Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (${Clang_FIND_REQUIRED})
--    find_package(LLVM ${Clang_FIND_VERSION} REQUIRED)
--else ()
--    find_package(LLVM ${Clang_FIND_VERSION})
--endif ()
--
--set(CLANG_FOUND FALSE)
--
--if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
--  macro(FIND_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--  endmacro(FIND_CLANG_LIB)
--  macro(FIND_AND_ADD_CLANG_LIB _libname_)
--    string(TOUPPER ${_libname_} _prettylibname_)
--    find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
--    if(CLANG_${_prettylibname_}_LIB)
--      set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
--    endif()
--  endmacro(FIND_AND_ADD_CLANG_LIB)
--
--  # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
--  find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
--
--  FIND_CLANG_LIB(clang-cpp)
--  FIND_AND_ADD_CLANG_LIB(clangFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangDriver)
--  FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangChecker)
--  FIND_AND_ADD_CLANG_LIB(clangAnalysis)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangAST)
--  FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
--  FIND_AND_ADD_CLANG_LIB(clangParse)
--  FIND_AND_ADD_CLANG_LIB(clangLex)
--  FIND_AND_ADD_CLANG_LIB(clangBasic)
--  FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
--  FIND_AND_ADD_CLANG_LIB(clangEdit)
--  FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
--  FIND_AND_ADD_CLANG_LIB(clangRewrite)
--  FIND_AND_ADD_CLANG_LIB(clangSerialization)
--  FIND_AND_ADD_CLANG_LIB(clangTooling)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
--  FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
--  FIND_AND_ADD_CLANG_LIB(clangSema)
--  FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
--endif()
--
--if(CLANG_LIBS OR CLANG_LIBCLANG_LIB OR CLANG_CLANG-CPP_LIB)
--  set(CLANG_FOUND TRUE)
--else()
--  message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
--endif()
--
--if(CLANG_FOUND)
--  set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
--  set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
--
--  # check whether llvm-config comes from an install prefix
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
--    list(APPEND CLANG_INCLUDE_DIRS
--         "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
--         "${_llvmSourceRoot}/tools/clang/include"     # source dir
--    )
--  endif()
--
--  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
--  message(STATUS "  Include dirs:          ${CLANG_INCLUDE_DIRS}")
--  message(STATUS "  Clang libraries:       ${CLANG_LIBS}")
--  message(STATUS "  Libclang C library:    ${CLANG_LIBCLANG_LIB}")
--  message(STATUS "  Clang dynamic library: ${CLANG_CLANG-CPP_LIB}")
--else()
--  if(Clang_FIND_REQUIRED)
--    message(FATAL_ERROR "Could NOT find Clang")
--  endif()
--endif()
-diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake
-deleted file mode 100644
-index fe7e87dd..00000000
---- a/cmake/FindLLVM.cmake
-+++ /dev/null
-@@ -1,162 +0,0 @@
--# Find the native LLVM includes and libraries
--#
--# Defines the following variables
--#  LLVM_INCLUDE_DIRS   - where to find llvm include files
--#  LLVM_LIBRARY_DIRS   - where to find llvm libs
--#  LLVM_CFLAGS         - llvm compiler flags
--#  LLVM_LFLAGS         - llvm linker flags
--#  LLVM_MODULE_LIBS    - list of llvm libs for working with modules.
--#  LLVM_INSTALL_PREFIX - LLVM installation prefix
--#  LLVM_FOUND          - True if llvm found.
--#  LLVM_VERSION        - Version string ("llvm-config --version")
--#
--# This module reads hints about search locations from variables
--#  LLVM_ROOT           - Preferred LLVM installation prefix (containing bin/, lib/, ...)
--#
--#  Note: One may specify these as environment variables if they are not specified as
--#   CMake variables or cache entries.
--
--#=============================================================================
--# Copyright 2014 Kevin Funk <kfunk@kde.org>
--#
--# Redistribution and use in source and binary forms, with or without
--# modification, are permitted provided that the following conditions
--# are met:
--#
--# 1. Redistributions of source code must retain the above copyright
--# notice, this list of conditions and the following disclaimer.
--# 2. Redistributions in binary form must reproduce the above copyright
--# notice, this list of conditions and the following disclaimer in the
--# documentation and/or other materials provided with the distribution.
--#
--# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--#=============================================================================
--
--if (NOT LLVM_ROOT AND DEFINED ENV{LLVM_ROOT})
--    file(TO_CMAKE_PATH "$ENV{LLVM_ROOT}" LLVM_ROOT)
--endif()
--
--# if the user specified LLVM_ROOT, use that and fail otherwise
--if (LLVM_ROOT)
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config HINTS ${LLVM_ROOT}/bin DOC "llvm-config executable" NO_DEFAULT_PATH)
--else()
--  # find llvm-config, prefer the one with a version suffix, e.g. llvm-config-3.5
--  # note: FreeBSD installs llvm-config as llvm-config35 and so on
--  # note: on some distributions, only 'llvm-config' is shipped, so let's always try to fallback on that
--  string(REPLACE "." "" LLVM_FIND_VERSION_CONCAT ${LLVM_FIND_VERSION})
--  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${LLVM_FIND_VERSION} llvm-config${LLVM_FIND_VERSION_CONCAT} llvm-config DOC "llvm-config executable")
--
--  # other distributions don't ship llvm-config, but only some llvm-config-VERSION binary
--  # try to deduce installed LLVM version by looking up llvm-nm in PATH and *then* find llvm-config-VERSION via that
--  if (NOT LLVM_CONFIG_EXECUTABLE)
--    find_program(_llvmNmExecutable llvm-nm)
--    if (_llvmNmExecutable)
--      execute_process(COMMAND ${_llvmNmExecutable} --version OUTPUT_VARIABLE _out)
--      string(REGEX REPLACE ".*LLVM version ([^ \n]+).*" "\\1" _versionString "${_out}")
--      find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-${_versionString} DOC "llvm-config executable")
--    endif()
--  endif()
--endif()
--
--set(LLVM_FOUND FALSE)
--
--if (LLVM_CONFIG_EXECUTABLE)
--  # verify that we've found the correct version of llvm-config
--  execute_process(COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
--    OUTPUT_VARIABLE LLVM_VERSION
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--  if (NOT LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "Failed to parse version from llvm-config")
--  elseif (LLVM_FIND_VERSION VERSION_GREATER LLVM_VERSION)
--    set(_LLVM_ERROR_MESSAGE "LLVM version too old: ${LLVM_VERSION}")
--  else()
--    set(LLVM_FOUND TRUE)
--  endif()
--else()
--  set(_LLVM_ERROR_MESSAGE "Could NOT find 'llvm-config' executable")
--endif()
--
--if (LLVM_FOUND)
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
--    OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
--    OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --cppflags
--    OUTPUT_VARIABLE LLVM_CFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
--    OUTPUT_VARIABLE LLVM_LFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libs core bitreader asmparser analysis
--    OUTPUT_VARIABLE LLVM_MODULE_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles
--    OUTPUT_VARIABLE LLVM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS}) # Make it consistent with --libs
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --system-libs
--    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --prefix
--    OUTPUT_VARIABLE LLVM_INSTALL_PREFIX
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--
--  # potentially add include dir from binary dir for non-installed LLVM
--  execute_process(
--    COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
--    OUTPUT_VARIABLE _llvmSourceRoot
--    OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
--  if (NOT _llvmIsInstalled)
--    list(APPEND LLVM_INCLUDE_DIRS "${LLVM_INSTALL_PREFIX}/include")
--  endif()
--endif()
--
--if (LLVM_FIND_REQUIRED AND NOT LLVM_FOUND)
--  message(FATAL_ERROR "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--elseif(_LLVM_ERROR_MESSAGE)
--  message(STATUS "Could not find LLVM: ${_LLVM_ERROR_MESSAGE}")
--endif()
--
--if (LLVM_FOUND)
--  message(STATUS "Found LLVM (version: ${LLVM_VERSION}): (using ${LLVM_CONFIG_EXECUTABLE})")
--  message(STATUS "  Include dirs:   ${LLVM_INCLUDE_DIRS}")
--  message(STATUS "  LLVM libraries: ${LLVM_LIBS}")
--  message(STATUS "  LLVM System libraries: ${LLVM_SYSTEM_LIBS}")
--endif()
--- 
-2.32.0
-
diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
new file mode 100644
index 000000000000..3862f40ad981
--- /dev/null
+++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch
@@ -0,0 +1,88 @@
+From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
+Date: Sat, 23 Jan 2021 15:34:10 +0100
+Subject: [PATCH] Fix build with Clang 12
+
+Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
+---
+ src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
+ src/SuppressionManager.cpp       |  5 ++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4db141ab..1737d5a5 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -29,6 +29,7 @@
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/SourceManager.h>
+ #include <clang/Frontend/FrontendDiagnostic.h>
++#include <clang/Lex/Lexer.h>
+ #include <clang/Tooling/Core/Diagnostic.h>
+ 
+ #if defined(CLAZY_USES_BOOST_REGEX)
+@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ #endif
+ }
+ 
++inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
++{
++#if LLVM_VERSION_MAJOR >= 12
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.hasValue();
++    return buffer;
++#else
++    return sm.getBuffer(id, invalid);
++#endif
++}
++
++#if LLVM_VERSION_MAJOR >= 12
++inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile.getValue(), sm, lo);
++}
++#else
++inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
++                             const clang::SourceManager &sm, const clang::LangOptions &lo)
++{
++    return clang::Lexer(id, inputFile, sm, lo);
++}
++#endif
++
+ }
+ 
+ #endif
+diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
+index 9d774ea6..9881388d 100644
+--- a/src/SuppressionManager.cpp
++++ b/src/SuppressionManager.cpp
+@@ -24,7 +24,6 @@
+ #include "clazy_stl.h"
+ 
+ #include <clang/Basic/SourceManager.h>
+-#include <clang/Lex/Lexer.h>
+ #include <clang/Basic/SourceLocation.h>
+ #include <clang/Basic/TokenKinds.h>
+ #include <clang/Lex/Token.h>
+@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+     Suppressions &suppressions = (*it).second;
+ 
+     bool invalid = false;
+-    auto buffer = sm.getBuffer(id, &invalid);
++    auto buffer = clazy::getBuffer(sm, id, &invalid);
+     if (invalid) {
+         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
+         if (buffer)
+@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
+         return;
+     }
+ 
+-    Lexer lexer(id, buffer, sm, lo);
++    auto lexer = clazy::getLexer(id, buffer, sm, lo);
+     lexer.SetCommentRetentionState(true);
+ 
+     Token token;
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 606384470e98..2c958d5d481f 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,15 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.10
-revision=1
+version=1.9
+revision=2
 build_style=cmake
-build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+makedepends="clang llvm"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce6d55ffcddacdb005d847e0c329ade88a01e8e4f7590ffd2a9da367c1ba39d
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
+nocross="Clang cannot be installed as makedep"
diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 871084663bf8..a112c1dc645e 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,7 +1,7 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.933
-revision=1
+version=1.10.3.855
+revision=2
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
 short_desc="Clojure programming language command line tools"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=c6c9b4fc7356afc6bfee22d0542f536d4900496bf0fc42376c3d1d30384b6570
+checksum=cb63ee38146ae646654e93d5f0dc245a1b2940a94dc708e5fa4fc3af08b19384
 
 do_install() {
 	vmkdir /usr/lib/clojure
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..11e2fa7b809d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.20.5
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,12 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch b/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
deleted file mode 100644
index 7b6ce9c16962..000000000000
--- a/srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-index dcdc7f1b96..37e13b6c5c 100644
---- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
-@@ -11,7 +11,7 @@ project(Minimal NONE)
- set(targets
-   aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
-   aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1
--  craype-C-Cray-8.7 craype-CXX-Cray-8.7 craype-Fortran-Cray-8.7
-+  craype-Fortran-Cray-8.7
-   craype-C-Cray-9.0-hlist-ad craype-CXX-Cray-9.0-hlist-ad craype-Fortran-Cray-9.0-hlist-ad
-   craype-C-GNU-7.3.0 craype-CXX-GNU-7.3.0 craype-Fortran-GNU-7.3.0
-   craype-C-Intel-18.0.2.20180210 craype-CXX-Intel-18.0.2.20180210
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..e0b6886bb0a2
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- a/Tests/ConfigSources/CMakeLists.txt
++++ b/Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..7ec873cb2afd 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,7 @@
 # Template file for 'cmake'
+# FIXME: cmake is being rebuilt on do_install
 pkgname=cmake
-version=3.21.1
+version=3.20.5
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,9 +17,14 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
 replaces="cmake-bootstrap>=0"
 
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" cmake"
 fi
@@ -29,7 +35,6 @@ pre_configure() {
 	mkdir -p build
 	cd build
 	../bootstrap --no-system-libs \
-		--generator=Ninja \
 		${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
 	# Make sure build directory is clean
 	for f in *; do
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 47b52033de20..fd8e518e2af6 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel faad2-devel libcdio-devel libcdio-paranoia-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  sndio-devel $(vopt_if elogind elogind-devel)"
 short_desc="Small, fast and powerful console music player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="UsernameRandomlyGenerated <coredavid@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://cmus.github.io"
 distfiles="https://github.com/cmus/cmus/archive/v${version}.tar.gz"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 6688949e289e..ef1690b5d344 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.10.1
+version=1.9.6
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=db839f18ba4796df77601bfe9873756ed340525d
+_git_commit=bbcbb733b416acd7066fe4e0157c58678e4ba1e4
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=c840ba7b52df3ec6105a7febe900e52dde504a33bd1fa4e2e1985a88b6072d41
+checksum=6e3c59057d43e9c614cde19499ef70d49e93f1978eb918022721abee7bc19ed8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 53e5e6bb3d2c..f8f525cee641 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,18 +1,18 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.0
+version=1.0.3
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
- python3-mutagen python3-gobject-devel gettext desktop-file-utils
- gtk+3-devel"
-makedepends="glib-devel python3-gobject-devel libhandy1-devel granite-devel"
+ python3-mutagen python3-gobject-devel gettext desktop-file-utils"
+makedepends="glib-devel python3-distro python3-peewee python3-mutagen
+ python3-gobject-devel libhandy1-devel granite-devel"
 depends="python3-peewee gst-libav gst-plugins-good1 gst1-python3
  python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
  python3-requests python3-gobject libhandy1 granite"
 short_desc="Audio book player"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=52f89c2801e31341426a133125f5f8367a49c98db121ad46bc4724761a086a38
+checksum=1e6c36054c859cdec6fadcc88be2cd653b88f23b7fef90c937da204e2539ac89
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d9c5281e0549..82d07e947050 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.0
+version=5.10.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=af4609ca2ea9e8e838b9c701b558d629920d963d4911a1ef7edbb7f5ac528f88
+checksum=36005e493e0db4605f3270d6b7ccb3ee4b42da7a70636b00f914425ec9fe3ec6
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 0b8d831ee873..04da01f33962 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl-tiles'
 pkgname=crawl-tiles
-version=0.27.0
+version=0.26.1
 revision=1
 wrksrc="crawl-${version}"
 build_wrksrc="crawl-ref/source"
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index d59f52e7d40e..b83def6d5f92 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
 # Template file for 'crawl'
 pkgname=crawl
-version=0.27.0
+version=0.26.1
 revision=1
 build_wrksrc="crawl-ref/source"
 make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://crawl.develz.org/"
 distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=94b1a42bf5814b508e40358b0ba54eda18932b00192d77a802e07cdd939cb545
+checksum=c8c6abbefa7f21383ea77cd017033050471e06c60ea4deebd033f5198bc39596
 nocross=yes
 
 post_extract() {
diff --git a/srcpkgs/crispy-doom/template b/srcpkgs/crispy-doom/template
index 92652880e224..4aa17ccb63d6 100644
--- a/srcpkgs/crispy-doom/template
+++ b/srcpkgs/crispy-doom/template
@@ -1,6 +1,6 @@
 # Template file for 'crispy-doom'
 pkgname=crispy-doom
-version=5.10.2
+version=5.10.1
 revision=1
 wrksrc="crispy-doom-crispy-doom-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/fabiangreffrath/crispy-doom"
 distfiles="https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-${version}.tar.gz"
-checksum=b414636e929af2a16e1fc586101dc378da4a8ad283b339be0749de34cbb3da82
+checksum=ba2f1ff7f85141cbd7780604f473566018432fae2bbcb86652fe2072aa0ea5e2
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 056584cb6bec..6616584870f9 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.2.1
+version=9.2.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=ecee3dee8506e4c369478f160957a4c2f744675e89a4b7386dd50d1db3f84ccc
+checksum=e8f72be7f3c26a1c4ed00c3ebb222d2959cd6c7f7f74a097a556b56e6a24ba96
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 8aa2382eb9a0..c318bb54a9e4 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.21
+version=0.20.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=018c805c88a15cbd8341d00badd00c92de256bc585c46336be78f1ff9a5a3cf2
+checksum=84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ef585572fbec..87912c2b7fe7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,10 +1,10 @@
 # Template file for 'cryfs'
 pkgname=cryfs
 version=0.10.2
-revision=4
+revision=2
 create_wrksrc=yes
 build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DCMAKE_BUILD_TYPE=None
  -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index f18f5f123b7e..8be87e888872 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.6.0
-revision=2
+revision=1
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 37a21d96335b..6e47ac8aeead 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.1.5
+version=21.1.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
+checksum=2f90677603d1f485bfb2bee73700830fa7c626a5c35822f17a5732c75def6837
 nopie=true
 
 do_build() {
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 48cc18df5b77..ac0e7983fafc 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config ${OPTS} 2>&1
+exec chpst -u deluge:deluge deluged -d ${OPTS} 2>&1
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 622e8a4d484b..ce2523384e40 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=12
+revision=11
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 187eaa0437cf..8e00e4c5579f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
 # Template file for 'dialog'
 pkgname=dialog
-version=1.3.20210621
+version=1.3.20210530
 revision=1
 _distver=${version%.*}
 _date=${version##*.}
@@ -14,7 +14,7 @@ license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
 changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 081186c5f0c8..3783405a23d2 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=180
+version=178
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=4969c9b2ee3e8a4f9151ec3c550d175f7936ab79f2f5c878688d4381b586326e
+checksum=7454cf417725ef81ffad16e8cc2f62753282f5171b1c651732b99c0b3c19e137
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index fda6cc8c94eb..94c058ab7d70 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.1
-revision=2
+revision=1
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.3.1
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/orisano/dlayer"
 distfiles="https://github.com/orisano/dlayer/archive/v${version}.tar.gz"
-checksum=6d091744618e03d1490de97eb0a41d89b70cedc4f242c004f4f2f4c7d77d859d
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
index 6e240fb488e2..a518ed815435 100755
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
+++ b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
 exec dnscrypt-proxy -config /etc/dnscrypt-proxy.toml
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e1121e376804..09d53d038ddf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.0.45
-revision=2
+revision=1
 build_style=go
 go_import_path=github.com/DNSCrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
deleted file mode 100644
index 130506a53b7d..000000000000
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -f ./conf ] && . ./conf
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
-exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
deleted file mode 100644
index a75da37f0c49..000000000000
--- a/srcpkgs/dnsdist/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'dnsdist'
-pkgname=dnsdist
-version=1.6.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
- --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt
- --with-libcrypto=${XBPS_CROSS_BASE}/usr --with-service-user=_dnsdist
- --with-service-group=_dnsdist --sbindir=/usr/bin --without-gnutls --with-lmdb
- --enable-dns-over-tls --enable-dns-over-https --sysconfdir=/etc/dnsdist"
-conf_files="/etc/dnsdist/dnsdist.conf"
-hostmakedepends="autoconf automake pkgconf"
-makedepends="libsodium-devel boost-devel re2-devel net-snmp-devel libcap-devel
- lua54-devel openssl-devel lmdb-devel fstrm-devel libedit-devel h2o-devel"
-short_desc="Dynamic DNS loadbalancer"
-maintainer="JailBird <jailbird@fdf.net>"
-license="GPL-2.0-only"
-homepage="https://dnsdist.org/"
-distfiles="https://downloads.powerdns.com/releases/${pkgname}-${version}.tar.bz2"
-checksum=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
-
-system_accounts="_dnsdist"
-
-if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
-	# This can be removed once MUSL is updated to 1.2.x
-	broken="no y2038 support"
-fi
-
-pre_configure() {
-	export LMDB_LIBS="-llmdb"
-}
-
-post_install() {
-	vinstall dnsdistconf.lua 644 etc/dnsdist dnsdist.conf
-	vsv dnsdist
-}
diff --git a/srcpkgs/dnsdist/update b/srcpkgs/dnsdist/update
deleted file mode 100644
index da8e072d218c..000000000000
--- a/srcpkgs/dnsdist/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*alpha[0-9]* *rc[0-9]* *beta[0-9]*"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 4a393422410e..5bde81e073f7 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.63.1
+version=1.62.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=292a023cc9525ff131612cf26412a1507c1f4daecbeefe4f931157f58b891fa0
+checksum=72202bba8c833457c64325fa71db50bd952f6c2507bd176a65702e0d60c4c339
diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..62d1bc863041
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+Date: Wed, 7 Oct 2020 21:25:29 +0200
+Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on
+ FreeBSD i386
+
+---
+ Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +-
+ Source/Core/VideoBackends/Vulkan/VKTexture.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+index fcff0db4048..80c0c4aa86d 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);
++      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);
+   if (!texture->CreateView(view_type))
+     return nullptr;
+ 
+diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
+index 91d3e54eac2..3b803dd4da4 100644
+--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
+@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture
+   VkImageView GetView() const { return m_view; }
+   VkImageLayout GetLayout() const { return m_layout; }
+   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }
+-  bool IsAdopted() const { return m_device_memory != nullptr; }
++  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }
+ 
+   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 3d12d4de6563..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,12 +1,11 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.14790
+version=5.0.13178
 revision=1
-_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
-_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
+_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
-wrksrc="dolphin-${_dolphin_commit}"
+wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -17,13 +16,11 @@ makedepends="
  mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
 depends="desktop-file-utils"
 short_desc="Gamecube / Wii / Triforce emulator"
-maintainer="Henry Naguski <henry@nilsu.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
-distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
- https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
- d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
+distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
+checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
 nopie=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -31,11 +28,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DENABLE_GENERIC=ON" ;;
 esac
 
-post_extract() {
-	rmdir Externals/mGBA/mgba
-	mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 3cb92a3a8abc..04ef83bdd326 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=082e39843d6b9e06bb495617ad19e161e78a272600a1ea0fdfaefc77fbd220b4
+checksum=9239c300cb7b27bb7810cedce11132bf9b0e4e0bcc1c1aba94b9cb8092d51d44
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index c2e03b0ff62d..0d514614a25e 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1
+checksum=e3a1560c216efaa80c3ec99138c4657e9602e17aea250a418b18c2fc85295264
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 254488aeae89..10da81b84903 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.2
+version=4.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=ace46328f2c284fee16581eb3dd18afa1e48e078ca25d5c3fae2bd6c6d76f251
+checksum=b0572f892744b7b4786319589a692d52cd8bad130517ffafe6bce3e0219f128e
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 5d525cdec0f3..51528a5f3356 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.16
+version=0.5.15
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+checksum=e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/dovecot/INSTALL b/srcpkgs/dovecot/INSTALL
new file mode 100644
index 000000000000..3c5ade70de65
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ -f etc/ssl/private/dovecot.pem -a -f etc/ssl/certs/dovecot.pem ]; then
+		exit 0
+	fi
+	echo "Creating self-signed certificate..."
+	usr/bin/dovecot-mkcert.sh
+	;;
+esac
diff --git a/srcpkgs/dovecot/INSTALL.msg b/srcpkgs/dovecot/INSTALL.msg
new file mode 100644
index 000000000000..2dc5444d4df9
--- /dev/null
+++ b/srcpkgs/dovecot/INSTALL.msg
@@ -0,0 +1,6 @@
+A self-signed certificate for SSL has been created automatically, but
+this should be created again with proper settings in dovecot-openssl.cnf:
+
+	$ rm -f /etc/ssl/{certs,private}/dovecot.pem
+	$ [edit /etc/ssl/dovecot-openssl.cnf]
+	$ /usr/bin/dovecot-mkcert.sh
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 18affe91fe17..9c3ef4cf0af2 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.16
-revision=2
+version=2.3.15
+revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+checksum=21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 36f4191696da..8990cd6689a2 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.3.0
+version=1.2.4
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=e5e61d9e9fb3556c7c2b05cbe8254904a59ba49707aff0ef57b1a5223d051f8c
+checksum=a69cec4c134270a79d877621a7fcbbfbcb4c18a5afa00f902b16a638963af2fe
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..4264945987a8 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 70643ecd550b..7307af04e468 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,12 +1,12 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=21.07
-revision=1
+version=20.07
+revision=3
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
-hostmakedepends="automake erlang git elixir rebar3"
+hostmakedepends="automake erlang git elixir"
 makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e
+checksum=7fd1142906a5f7d0345dc3d1363f94c62cc7d62088f5b2f3bd70dff4dca3bb41
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 91200e0c3402..92f21f07ef4d 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.5
+version=4.1.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
@@ -20,7 +20,7 @@ maintainer="Charles E. Lehner <cel@celehner.com>"
 license="MIT"
 homepage="https://electrum.org/"
 distfiles="https://github.com/spesmilo/electrum/archive/${version}.tar.gz"
-checksum=74bf1ff3675d62f45ffe9178679b963f57ee6be0fc0d0a807e559967db714bd2
+checksum=31f3a794565c3360f129b97d9a3962f8cc978f79d1b0f69d0929e00ce2bfc0d8
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index b170b225acaf..98a82b875bc5 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=d57b46c0d1518b50f2875c5eca20006389f64e91560146fda7f0a87852e7f493
+checksum=13b76c27246f348180501c4dd26c9c8070f32b3fbebb49f5e7d4596d9b27eec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 093f55147690..d24aaabc145c 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.0
+version=0.5.2
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=17c2c2e105d0481f42d5635d9eacbe3d46ce33274c8d25359924760e66f88a80
+checksum=469e69b28035e8225f4d41f4e5a002607a5ea5e3ac796a64ef53b22d279c8419
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 310c56c03095..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=3
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -15,7 +15,7 @@ make_install_args="$make_build_args"
 configure_args="--enable-relocatable"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel hunspell-devel aspell-devel libvoikko-devel
- libnuspell-devel icu-devel"
+ libnuspell-devel"
 checkdepends="unittest-cpp"
 short_desc="Generic spell checking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 53573c6592a2..f04c2e32dd0c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.0.5
+version=24.0.4
 revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 changelog="https://github.com/erlang/otp/releases"
 distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=dd189cf94bf86c610a66f5d9f1a49b8d95a7ce1a7534d216e97e8fade271e624
+checksum=5af12fb9c8fd7f29b2b4136ed9a451a7218132430641ca4ebf1495f85a732b9b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/evilwm/files/evilwm.desktop b/srcpkgs/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..0cd248437214
--- /dev/null
+++ b/srcpkgs/evilwm/files/evilwm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=evilwm
+Comment=EvilWM
+Exec=evilwm
+NoDisplay=true
+X-GNOME-WMName=evilwm
+# evilwm doesn't talk XSMP yet, so don't start in the WindowManager phase:
+X-GNOME-Autostart-Phase=Applications
+X-GNOME-Provides=windowmanager
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index fc505b5da445..070531e719da 100644
--- a/srcpkgs/evilwm/template
+++ b/srcpkgs/evilwm/template
@@ -1,22 +1,21 @@
 # Template file for 'evilwm'
 pkgname=evilwm
-version=1.3.1
-revision=1
+version=1.1.1
+revision=2
 build_style=gnu-makefile
 makedepends="libXrandr-devel"
-short_desc="Minimalist window manager for the X Window System"
+short_desc="A minimalist window manager for the X Window System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
-homepage="https://www.6809.org.uk/evilwm"
-changelog="https://www.6809.org.uk/evilwm/doc/ChangeLog"
-distfiles="https://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=32ecbb5c4c5462dc5ed1f315f18561a889da77fffaef7fc616808a37b1193ecb
+homepage="http://evilwm.sourceforge.net"
+distfiles="http://www.6809.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
 
 pre_build() {
-	vsed -i Makefile -e 's|^CFLAGS|#CFLAGS|'
+	sed -i 's|^CFLAGS|#CFLAGS|g' Makefile
 }
 
 post_install() {
-	vinstall evilwm.desktop 644 usr/share/xsessions
+	vinstall "${FILESDIR}/evilwm.desktop" 644 usr/share/xsessions
 	vlicense "${FILESDIR}/LICENSE"
 }
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..136c47804c04 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b04ee1b2d1cd..57af7cf1eb6e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.30
+version=12.29
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://exiftool.org/"
 changelog="https://exiftool.org/history.html"
 distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=3be7cda70b471df589c75a4adbb71bae62e633022b0ba62585f3bcd91b35544f
+checksum=256d5e46a8c73a202c7e56da2a2bd85e97adfc4c59672e49ca38df1c21ffda27
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 3ebd6f056961..484b68326218 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a4209c3b113dc50250920186a2d30b71870e11ebb92a700a611b423ce6b6634
+checksum=bb085ef2e177c182ff46988516b6b31849d1497beb2ff5301165ad2ba12a1c41
 python_version=3
 
 do_check() {
diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template
index e3b98977791f..da7cf1f1bfb5 100644
--- a/srcpkgs/extrace/template
+++ b/srcpkgs/extrace/template
@@ -1,7 +1,7 @@
 # Template file for 'extrace'
 pkgname=extrace
-version=0.8
-revision=1
+version=0.7
+revision=3
 build_style=gnu-makefile
 depends="libcap-progs"
 short_desc="Trace exec(2) calls system-wide"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://github.com/leahneukirchen/extrace"
 distfiles="https://github.com/leahneukirchen/extrace/archive/v${version}.tar.gz"
-checksum=d83e48551b168c5d78815e4e9e93c02d7dea8c8aa2518a25a0876cdec7c858eb
+checksum=62e6623d4891494a307f9f7247b8581794232d4d26617009eae763a48280abcf
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index 4abc63302393..2b8fe877a8be 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,23 +1,21 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=1
+version=0.11.1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
 short_desc="Authentication failure monitor system"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="GPL-2.0-only"
-homepage="https://www.fail2ban.org/"
-changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
-distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+homepage="http://www.fail2ban.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf
  /etc/fail2ban/action.d/*.conf
  /etc/fail2ban/filter.d/*.conf"
-make_dirs="/var/lib/fail2ban 0700 root root"
 
 pre_build() {
 	./fail2ban-2to3
diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index acd74c9683e1..894b6332bd71 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.4.5
+version=2.4.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b17fcf556e2beecacd0b5dbcdf4441b737850576446f33342a3577b6afd09ee9
+checksum=dabf5d83bf464c493fdd3a0baa69dc549ba08633299f0197d20707ae875a59ce
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index bfda3ee686ca..a4b20913c9ec 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.21
+version=6.4.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d
+checksum=cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..6a7510d3adc3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,9 +2,9 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=2
 short_desc="Decoding, encoding and streaming software"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index b7c0263746a2..0c03aff7ced4 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=785066457381086a3fa87e8df423632b029510d3c71efa8e8563e667c63c48f4
+checksum=e02374e49ac445969254e1b6f8edfeca478e36b7e00809c97e2f69ef33e2d8d3
diff --git a/srcpkgs/filezilla/patches/libtool_tag.patch b/srcpkgs/filezilla/patches/libtool_tag.patch
new file mode 100644
index 000000000000..0aa3f667b913
--- /dev/null
+++ b/srcpkgs/filezilla/patches/libtool_tag.patch
@@ -0,0 +1,11 @@
+--- a/src/commonui/Makefile.in	2021-07-21 21:11:45.600907372 +0200
++++ b/src/commonui/Makefile.in	2021-07-21 21:12:01.772920575 +0200
+@@ -191,7 +191,7 @@
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) \
++libfzclient_commonui_private_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(OBJCXXLD) \
+ 	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ 	$(libfzclient_commonui_private_la_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 8e794831bf7f..9e2300161159 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.55.1
+version=3.55.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+checksum=ae70eb4180d136be29bbad6fcdd188e497e205fc416ea3e413dce7cd8cab9c82
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index a32c55b9e878..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.13.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
- efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
- c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
- 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
- e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
- f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
- 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
- dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
- 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
- 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
- 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
- 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
- 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
- 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
- d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
- 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
- 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
- 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
- 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
- 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
- b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
- fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
- 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
- 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
- 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
- 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
- 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
- e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
- 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
- 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
- c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
- 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
- b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
- 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
- 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
- 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
- da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
- cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
- 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
- ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
- 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
- ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
- 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
- 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
- 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
- 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
- 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
- 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
- c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
- 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
- b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
- e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
- 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
- c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
- 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
- e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
- 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
- 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
- ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
- 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
- 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
- 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
- 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
- e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
- 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
- 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
- aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
- 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
- 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
- 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
- feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
- f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
- 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
- fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
- df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
- 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
- c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
- c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
- d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
- e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
- a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
- 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
- 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
- fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
- 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
- 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
- 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
- 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
- a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
- 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
- e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
- cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
- 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 79f1e4a21e58..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.13.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 46c247e38536..7621cc56f091 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=91.0
+version=90.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
- 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
- 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
- ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
- 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
- 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
- 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
- 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
- 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
- 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
- ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
- ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
- cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
- 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
- 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
- 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
- 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
- adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
- e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
- 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
- d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
- 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
- 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
- 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
- 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
- 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
- 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
- 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
- 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
- be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
- c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
- d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
- 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
- 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
- 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
- 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
- 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
- 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
- f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
- 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
- c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
- 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
- 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
- c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
- 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
- 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
- bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
- 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
- b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
- 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
- f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
- c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
- 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
- d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
- 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
- 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
- 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
- ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
- 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
- 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
- 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
- c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
- c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
- 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
- e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
- 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
- b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
- 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
- c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
- 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
- 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
- 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
- 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
- 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
- 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
- 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
- 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
- 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
- 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
- b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
- a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
- 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
- b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
- 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
- fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
- a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
- 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
- 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
- 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
- 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
- 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
- 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
- d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
- 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
- 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
- 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
+checksum="6a847f99a28bfbd69c80c905b12da89ac6cf3ba11b5a8910923331259d2ce20c
+ e389578012f1737807f86b91a667c00b1e8aa1f97f5396f99541d869d9e8d9ca
+ 0959a202ac994df39c12968fba79882862da9443c51d733fc686b093f4cbb002
+ d754b4c4b07f00dcdf66c1165596e9929dfb410c337c16c5a3d39e58a6bb8ce9
+ 2fc600b9d8ede173de21fc0cecf885f90d989d889833385120b6ef68068da4a1
+ d240023fe4d5cf7df3fb6fca7f5db5fd0acc3682f280648c12ebd5d16cf5e263
+ 6b0eba7e19fc7e3a91c8aeb57c2f960bdbaca2e2f53c0cccb3a8e64ac3042aba
+ 29e3abdb69600bd5113b85db771e6c091f74461d56bb47303af12f1c43750667
+ baae42ddfa4001ac75d503d8099fb49e1e7c9b52c9f0b1aae8db1d6a9f7f2d91
+ c9b03150b23971a5640cfbcfbd2af3defcb5d67d565d762bfb240275d25824df
+ 8a2007fc267c3e6790281ec52a0694f789ca0ac95968b9ab662c11b096f03aca
+ d2e80267a2c8184bcb1a08c7b937aa24a0b2d0d3083b145bfe02c6c73be49ca6
+ 00419f454f44af8f3422a9f3308a8fe7af0b266c53998b815fc0350bcbfbd560
+ e53ec85e4c531794c95e9d518ec10ddad42e1df0a6cda78e3f70de0bf60cce34
+ 8705fe76cc395d9e0a13dbc3812a58fd7463a95216fb9a632f5cf045f03c1350
+ 8d5c197ba6598bb8c138f5e00cb5e2717ac2796857b065c2c5a56be7e9e9e217
+ 7bbe55d91af9ad45b16078118f85ca52b0a8d65b4d60719dc1920bd9a9ddad96
+ 42ac88d57d14568bfbb0fa98baa4ec002f24ff7d4c4107db4112f5940e7e333c
+ ce610b3f39162b7dd70beb674083c066cdcfe6632ed5b56421dc31da9a253029
+ ca66e6d3f1b03d91bb47ca921a55c6c2abc881798a8eca86f11a8a06a611cbda
+ 2f983279220a58b50a81e23385b7eb7c59834abca7a5b260c95ffdb954317810
+ 71d8db8f80a279b537ef34a2bcaebab00bcc164d9dc39c4733a9c639e2f9759e
+ cca6d9330db52580ea5b98ef4bd9af45a5d48f49125f2ee305d53930f2bc4a25
+ 2b1c764f279e6a356b9d916c03420ea14a13ae9b0346026addf11a38b4e37179
+ 087e71fb9210509b1cb24d66fa17bacf6950e99a09feebb04d29a36c2b41e2e6
+ f85a6008fff28eb6886f8ca6b7fe8295694f7420d660b647263771568c51c27a
+ 9b287dedaa945f45ab4e035f715dca684ee7326e137c4cb09365143652f4fbb3
+ 26e69023046df3bf520250f01f8a56cc12973588f7425d3dd7ab2f423dcac5b8
+ d7b8cbde5b38daa5efaa97bb1339f04514e40cd450b915ad08b1d6772225820e
+ f4b73815c37364b127f907188513821134d56c11946976b7ae39075fb39656f9
+ 48d7c9a6516a616aa0d520b8c02f51c59eda4c096ff39a8f43e410b35c11aba7
+ 9a020f5a56df7d22dd6f4de2aec8d6f3aa66fca63c57077aeebda5c35f2d1e44
+ 9ef5583f6fcf03f1e87718d40b29018e9e64a6d42c9f0521d82eadffe59f4114
+ c5e7d5d787a11cb2ca24fbba9219b193fe00132ced43eb80fcd263a81658c1d9
+ 555162a321adabddd8df8f7aa71ced3254803c0f4cee544fb693b0e6ca03d62e
+ 7a65b020f9ecad3338691b296053b2870b9f6fa1afa28e49470fe33e579eca6d
+ 187f924d0218d3c2efeb979fa85f308b9b2bb3ad69dcd44777701583291d4289
+ b6f7096d623972c453a05c030b6afbd3bf097036b71138b458226d1b2c5581b2
+ e3de3a816ab6eae4f330963cdfe52af2fcb5535450cacd7f50923931e5da68b5
+ 491becad650258ad42b79bcd21c63bd9f07861d26d64584753c756741dfea5f1
+ 377e94a7cf76f10f8f69818cde5c64024c3be6898136167b4e2d56f49fba493c
+ 50be198cbfac1a470787cd9a1efb9ec040cfac792bfef9d5d2414ebb12323506
+ 6755b4f1b5de1aa8dff67f2c80b27ec7c801a1ad1b189a530981de22d9aa6d1c
+ 56a145776fecc4bfbfe3d110be4b397d5c07e5fc15b5d446f76f453eac54a136
+ da333297b9b5f96c3974d9ed0ae5ab032a193f330f91682bfbc0b01f9569ab77
+ 64bdec55f42f64a08f5f9a86de045bea085902eadf3f0103694bbc47d0a51ee0
+ fbc25c307627b0e4a66c4e13b3090acc8aa2fb502368c4f35a38eac5bd586e4d
+ fccc7bfa4d1c2962c8a3d065691ccf5a5958ce61346a9f1b5dfdcf8960d0aa85
+ bbecfa079679f85c6b222b17bbc30145e386577138ebf11c92af6e25303041ae
+ 9847e1ae7cad612c2ab25f055805affeaa1f0c357b3248434ff69d2160cd30ca
+ a654300b2e9f386b1c9d0764155604dc840c9b07cc70702a4b351aeecdfcc6c0
+ f7c0bf57ba386af117b20e86e08194d1b6351dd739fe3fa44aa156055e22a389
+ ddba6d70ed9c87fc5972a977037692276d37a7a0f8191fc0f8d5a57316d848e8
+ 7f849a6f5cf815dae4ec6d5660bb0e5c5e2da99d43153270c15d1b3b972b852e
+ 9b3f1cc5440325988bbcde602130382050cfe4283f0819008d7a303b6b8669d7
+ 9ec42d3a0559b072cd95c7588d18888527ce6fd4239313278d2dffeee1709bfc
+ 9f40539aa73ac097cba4230e5ea08aad2ec1b667b6b0eb03e4c0d5702433a2de
+ 3cc578d753e77e97a4496ede0fc4f930a3261fd70c378ecee3b227e99bff0512
+ 4ac708be12069c8747f52a54cc864776634f08aaf83312195f01ddd15373895f
+ 752090681af9d3cc5771b407d83f9684b792029df3b02e9af9dfa9298a70d215
+ 9e3a12b09243fa2cdf579afdcb18c024d6f8522dfa1a94f70cd7bc7646588fed
+ eb3e4795e3d9e6d263f7defb41e1bf182b69694baa5210de4e36339d2b4a7907
+ c0d9f167956b364b661fa531dbc6fcc49e979e2487e7b9dcc2a18568a46997d6
+ 0f783cdf2c3af210baafc68c11a05d8f18da4eb559730407696b118a65647da5
+ e8339950ca45ba30f59172f776c03a13ab91952a4d88462c421f773bd87fe736
+ e3e34c053cd92c55c5cf3dedfebe067f49340d31059e6e04c19885196d644246
+ 46f6755afe5c692579025f1c089a3a6dc98e04a261d254df4ca177d74341bad3
+ 09a6e858e29bb1825c5ff07aa6d630339a674d164a5bceb3cba1488adf325db5
+ 3d1fece4fa6022b6a68e2b2feb3c36e07ee518844795889ac6d44f302e00f9c7
+ 11598b4f9a8e4775f8c0ff5ac126fa17f3b23f6dfbbe8cc8c66b3d7de9b556b4
+ 5c52c08f2e04e85ae0c957e0087f0b39ac1f152549ee6e9fd33125d9c11b15e7
+ 2a1aa6575372dfd351d762100a2c8751f9cd3960b1435a365c8d6df6ecc70234
+ fa2c7956764deaae789a7e853423129fca228e0dfcc5e4258b2f32d39674140a
+ 1f579263ed4a8ef21f67a62453ed1f5f592d959518db73458287532311d703e6
+ 826f7778d2c69e1a09eb5bc2b4d83878f078539039d5d723c1afaa643841829b
+ 11d015cff3c3f51a58d2377c462a3b15a0e6fc7dcdf8c23c2be72510bc9955b3
+ b4c1dda9a5143d00568ccf651cc5cf4f5ed79d1fec309d6cd42489474656322e
+ 2c9270b201f5f34fb6749e544ee44c7776d6faf95076affdfdd18d3244e3b1d1
+ 0283a19da938ea4cd75323c1b273c2edb754a7b06d51ab236651da27631bde14
+ 57a09ec1440b8d86d11e7dd287718080c908f22f371dd109aaaef2391c070eb8
+ 1a85ae8363c844c8afd3252a332bf2603e6ced2279e7f99a4da7d4a4f6005867
+ ef4631a82196a199d97a9af3555d25776471a9ce5974e98d2a6a1f39861db931
+ b0b347920ac0b33d12cf6db5e417de40ef1893467a40132166d1d026667dae6d
+ fe9d74f540dcc3fbaffb688fc52c6d8fd7baeac41eba863e4f44e1df611325b8
+ 34cdc2ca797647f215be2253793e22b900982f5f671d5bb5aa43dc7658fcc03e
+ 1c31a101cf95564f4127b5a82e31ff3ffbd00d63150221e372460e7f4d6ca7f6
+ 2c4ad4d64ed930ce5ba5ded5ce02e36deda40cca38401a952b47787ff33f73c3
+ 4b7349a40591164e49ef14186aebfc67f568498c2490de719658adf6d56d267c
+ 96a9ea57610668310b1e5df044da22da58804e49f86cbd680a716daaf8c12018
+ 27ac4999a85a5db37f5a7b9f57077ef486dc87d1c6b6b629f3f481ad8029efa1
+ 187ef59014be6dbfe38d4c7154d12657e9364412b7a08f6d10e276d581eb886c
+ ebff39e1a8c0b4c794943839e8e571973bb7c73cde2c00a5e8af88b0b6e016d7
+ 0246b5614df11b4b15a5ef389ca0df1a397082f337fdff014ea61f7d872904e3
+ 478f5ef7f9555cfe84c79f9f52577045a74491f6612a9ee4f5542f922b39c351
+ ec3bb98ef5c3213932588b14ab3bb5c954945c844f38503f5cf02d4564f4f41f
+ e0695aced062822baeddeaedff8c2714cadf2195646cf114c2dbe5acdcbb56b7"
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
deleted file mode 100644
index e85cbce36583..000000000000
--- a/srcpkgs/firefox/patches/lto-thin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
-
-use lto=thin to reduce memory pressure when building gkrust
-https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
-https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
-Index: config/makefiles/rust.mk
---- a/config/makefiles/rust.mk.orig
-+++ a/config/makefiles/rust.mk
-@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
--cargo_rustc_flags += -Clto
-+cargo_rustc_flags += -Clto=thin
-+export CARGO_PROFILE_RELEASE_LTO=thin
- endif
- # We need -Cembed-bitcode=yes for all crates when using -Clto.
- RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index f9693404b846..8c61a1a7f50e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=91.0
+version=90.0.1
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
+checksum=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
 
 lib32disabled=yes
 
diff --git a/srcpkgs/flameshot/template b/srcpkgs/flameshot/template
index 37673aa7e1b2..aeedc7372f49 100644
--- a/srcpkgs/flameshot/template
+++ b/srcpkgs/flameshot/template
@@ -1,6 +1,6 @@
 # Template file for 'flameshot'
 pkgname=flameshot
-version=0.10.1
+version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lupoDharkael/flameshot"
 distfiles="https://github.com/lupoDharkael/flameshot/archive/v${version}.tar.gz"
-checksum=c2d760345d78dd5d2488c6bea54cb10870b09772179f33594a33c8f62ccdeeb9
+checksum=44e53c5dcefddb05bd6fa1af667df287f44baa1746468bfab5f76318c0bb3f83
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 41a50a0f8e0e..ba9ae5c4ee49 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,16 +1,15 @@
 # Template file for 'fmt'
 pkgname=fmt
-version=8.0.1
+version=7.1.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
 short_desc="Modern formatting library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/fmtlib/fmt"
-changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
 distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
 
 post_install() {
 	vlicense LICENSE.rst LICENSE
diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template
index 890f74cc8be0..c4fcf1d5d3f4 100644
--- a/srcpkgs/font-awesome5/template
+++ b/srcpkgs/font-awesome5/template
@@ -1,6 +1,6 @@
 # Template file for 'font-awesome5'
 pkgname=font-awesome5
-version=5.15.4
+version=5.15.3
 revision=1
 wrksrc="Font-Awesome-${version}"
 depends="font-util"
@@ -8,9 +8,8 @@ short_desc="Iconic font (version 5)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="OFL-1.1"
 homepage="https://fontawesome.com"
-changelog="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/CHANGELOG.md"
 distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz"
-checksum=82c301594a566277ba3cf41e037fc03ae101727d3e5d682d09e322a53937b5ed
+checksum=3159331c378de00ae69d6c35d7b00f8d9610eafd6acc4c5c28319c08e9158a31
 conflicts="font-awesome>=0"
 font_dirs="/usr/share/fonts/OTF"
 
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index ef65eb9bac4c..a07e56051e29 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=10.0.0
+version=7.2.6
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 99f1a52dfab04bece8831c46aa0cf45c417e4b617de551b7e427b96daee72a63
- 840e737c18ca3f00e44c57a9123f0518fa591ef64016732d74bd5d9451a2dcb5"
+ d8ad07d794837ede9d5d4d5fc368038047f5b50933fd9a1d04898741890abed3
+ 19542e20d5a74f172db2aa8a4320306be67e10d0d673cc12f6968116539a193d"
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 284198e2261a..cd14abb6e1ba 100644
--- a/srcpkgs/font-sarasa-gothic/template
+++ b/srcpkgs/font-sarasa-gothic/template
@@ -1,6 +1,6 @@
 # Template file for 'font-sarasa-gothic'
 pkgname=font-sarasa-gothic
-version=0.34.1
+version=0.32.9
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=27bee9a1bdb8d94cb686816fb7961c5cced038fdd955148fbb3a297c94e974e0
+checksum=0ac1034d04be24b7f79ac1f555b4cb86a50fff7141d297700be8969da444b6a9
 
 font_dirs="/usr/share/fonts/TTF"
 
diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index aec58ce0e3ae..1c4be3cac47a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f9d799b70f1c8ae661775c0a968e459bff8c5411567856075ac143573c0c77c8
+checksum=39faa8341e8f410dce907ec62f460f46dd1d2ace573ad96e47f3ade90ad7f94b
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 353e5a9f77cb..52a4365845f2 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,6 +1,6 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.7
+version=1.8.11
 revision=1
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=09b6892e8c801344fa6f4b60b88a5804586fec53eb7a6bf27ef2a3ff384909b5
+checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bf89ee95bf17..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.4.0
-revision=1
+version=2.2.0
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -19,8 +19,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=80eb7e09e2a106345d07f0985608c480341854b19b6f8fc653cb7043a9531e52
+checksum=883bc0396c6be9aba6bc07ebc8ff08457125868ada0f06554e62ef072f90cf59
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template
index 2ed1a5200bae..2c735f29df7f 100644
--- a/srcpkgs/fstrm/template
+++ b/srcpkgs/fstrm/template
@@ -1,6 +1,6 @@
 # Template file for 'fstrm'
 pkgname=fstrm
-version=0.6.1
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,9 +9,9 @@ short_desc="C implementation of the Frame Streams data transport protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/farsightsec/fstrm"
-changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
+#changelog="https://raw.githubusercontent.com/farsightsec/fstrm/master/ChangeLog"
 distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz"
-checksum=4f0f7ad2b760119c441aba58271e84de683b3cc138530d02710896641866e2d2
+checksum=82851b2424ae3e94b4fba310b60629b33d6757fbeb15662566b1857cd5c31517
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 94fe54f78e47..706577def94d 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.6.2
+version=1.6.1
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=55b7eea342cc0cef8cd40756c7ef2ca30eebc462081d445375a43c9ae5c8555f
+checksum=43d809858a7f093d8f10e48371c806409bd3a57e5d9021a6912cd90bfbee5b4d
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..a74b1ff16cd2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,25 +1,25 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
+version=3.38.1
 revision=2
 build_helper="gir"
 build_style=meson
-configure_args="-Dprofile=release -Dcontractor=enabled"
+configure_args="-Dcontractor=true"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
  gobject-introspection vala glib-devel gettext"
 makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
  libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
- libpeas-devel gsound-devel libstemmer-devel"
+ libpeas-devel gsound-devel"
 depends="gir-freedesktop gnome-keyring"
 short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
-make_check=no # tests fail with a webkit process crash
+_series=${version%.${version#*.*.}}
+distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
+checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
 
 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 7ae7950c72fb..13ff8252378d 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
 # Template file for 'gerbera'
 pkgname=gerbera
 version=1.6.4
-revision=4
+revision=3
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/gespeaker/template b/srcpkgs/gespeaker/template
new file mode 100644
index 000000000000..1b54bc36c9be
--- /dev/null
+++ b/srcpkgs/gespeaker/template
@@ -0,0 +1,15 @@
+# Template file for 'gespeaker'
+pkgname=gespeaker
+version=0.8.6
+revision=3
+build_style=python2-module
+pycompile_dirs="/usr/share/gespeaker"
+hostmakedepends="gettext python"
+makedepends="python"
+depends="espeak librsvg pygtk python-dbus python-xdg alsa-utils"
+short_desc="GTK+ frontend for espeak and mbrola to speech the read text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.muflone.com/gespeaker/"
+distfiles="https://github.com/muflone/${pkgname}/archive/${version}.tar.gz"
+checksum=b5db76a35bed5a2ade3cdb653ecbea75cd8b006cfae92c8c034dfcd074387d15
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
deleted file mode 100644
index ff1c217d297e..000000000000
--- a/srcpkgs/gi-docgen/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gi-docgen'
-pkgname=gi-docgen
-version=2021.6
-revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
-short_desc="Documentation generator for GObject-based libraries"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="Apache-2.0, GPL-3.0-or-later"
-homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
-distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
-checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
-make_check=no # no tests, but check fails
diff --git a/srcpkgs/giac/patches/pari_2_13.patch b/srcpkgs/giac/patches/pari_2_13.patch
deleted file mode 100644
index 85ee3aca0a2c..000000000000
--- a/srcpkgs/giac/patches/pari_2_13.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-change in order to pass chk_fhan4 with pari-2.13
-
-This patch is already upstream in giac > 1.6 so it will be
-removed when we update giac.
-
---- a/src/pari.cc	2019-11-21 13:40:55.000000000 +0000
-+++ b/src/pari.cc	2021-08-11 20:51:39.243502400 +0000
-@@ -88,7 +88,7 @@
-   static map<string,entree *> pari_function_table;
-   static void do_giac_pari_init(long maxprime){
- #ifdef PARI_DYNAMIC_STACK
--    long pari_mem_size=512000;
-+    long pari_mem_size=1024000;
- #else
-     long pari_mem_size=64000000;
- #endif
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 3689027daf17..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,7 +1,7 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=5
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
diff --git a/srcpkgs/git-lfs/INSTALL.msg b/srcpkgs/git-lfs/INSTALL.msg
new file mode 100644
index 000000000000..92448b0f4858
--- /dev/null
+++ b/srcpkgs/git-lfs/INSTALL.msg
@@ -0,0 +1 @@
+Run 'git-lfs install' to configure git to use git-lfs
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index d0bfbc07d7b6..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=2.12.1
-revision=2
+revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 37bd50d1d30d..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.33.0
+version=2.32.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey perl-CGI"
+checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+checksum=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 263e2ca17c7a..c82af3311dfb 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.14.0
+version=1.12.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/v${version}.tar.gz"
-checksum=1a99050644b4821477aabc7642bbcae8a19b3191e9227cd8078016d78cdd83ac
+checksum=14ef58fb2f09da1d66194527e1e8b637d28d972d273a6a627056aa960a9a9121
 
 pre_build() {
 	local _date
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 01c3990534e7..b92478185d66 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=53d6469446d7a09b026936769e595352fdf3be5632f346bb01fe57c8b5162ceb
+checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 431ac5b9777c..101c2b9a9149 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -10,6 +10,5 @@ short_desc="Extensions for GNOME shell, including classic mode"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-40/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9df87fa9535201febca3d508fdbf7bad0171cf7a27cb664dd4e3c1f96c4ed04b
+checksum=a8518dd4c83a784fa8d39a5ed600bf81d637a18eebe590e3b627183e0bf914f8
diff --git a/srcpkgs/gnome-shell-mousewheel-zoom/template b/srcpkgs/gnome-shell-mousewheel-zoom/template
new file mode 100644
index 000000000000..6e225e6aad9c
--- /dev/null
+++ b/srcpkgs/gnome-shell-mousewheel-zoom/template
@@ -0,0 +1,23 @@
+# Template file for 'gnome-shell-mousewheel-zoom'
+pkgname=gnome-shell-mousewheel-zoom
+version=0.8.0
+revision=2
+wrksrc=gnome-shell-mousewheel-zoom-upstream-0.8.0
+hostmakedepends="vala pkg-config"
+makedepends="libglib-devel libX11-devel"
+depends="gnome-shell"
+short_desc="Enable mousewheel zoom using left-alt key using gnome-shell"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom"
+distfiles="https://github.com/tobiasquinn/gnome-shell-mousewheel-zoom/archive/upstream/${version}.tar.gz"
+checksum=5f57affb89ef5091d94e03f7c074e0dc89da7952efbb399d4a7bf2b0848d8a40
+nopie=yes
+
+do_build() {
+	make -f makefile
+}
+
+do_install() {
+	make -f makefile DESTDIR=$DESTDIR install
+}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index d62240aeeafd..0fb12cfa4698 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=40.3
+version=40.2
 revision=1
 build_style=meson
 build_helper=gir
@@ -20,12 +20,17 @@ short_desc="GNOME core user interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=7ab10c6ee9699828dd721ebf8ce1de464dcaaa91d495823bf4b84c89399e8c2b
+changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=4e9d829b039fa0add33bb6583fc7b4e028ed8dcff7af8a577e09cc66988c281c
+_xdg_runtime_dir="/tmp/gnome-shell-xdg"
 
-do_check() {
-	mkdir /tmp/gnome-shell-xdg
-	XDG_RUNTIME_DIR=/tmp xvfb-run ninja -C build test
-	rm -rf /tmp/gnome-shell-xdg
+pre_check() {
+	mkdir "$_xdg_runtime_dir"
+	export XDG_RUNTIME_DIR="$_xdg_runtime_dir"
+	make_cmd="xvfb-run ninja"
+}
+
+post_check() {
+	rm -r "$_xdg_runtime_dir"
 }
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 4309553e29cc..64469ecfa77f 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.6
-revision=2
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..483dd8011bee 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..9335681ada37 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 9fd5ac2f8cf2..d9e2c5a9ba69 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.7
+version=1.16.6
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
+checksum=a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ecba40893775..403f32f96ff4 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=92.0.4515.131.1
+version=92.0.4515.107.1
 revision=1
 _chromeVersion="${version%.*}"
 _chromeRevision="${version##*.}"
@@ -21,7 +21,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=6fcc67888aac64047247931d16958973e66291a00f3c204b2af510fcf661d313
+checksum=52b75a439ab7ab51f1bd302ac6b425191f8cab4332ea4e2dfa3ec4e42447cf6d
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 59bf16144626..c983c6e15b9f 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.1
+version=0.7.0
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=b4856f49ca402b91e3242bafd8c9e8b2ff670e4671bea810bb054e43b05f0f54
+checksum=443476a0158195be302d7a0be2f4a0751780412d8fa411ac52017834c363664f
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template
index 8c7b262b5dbb..e731c606727d 100644
--- a/srcpkgs/goxel/template
+++ b/srcpkgs/goxel/template
@@ -1,6 +1,6 @@
 # Template file for 'goxel'
 pkgname=goxel
-version=0.10.8
+version=0.10.7
 revision=1
 build_style=scons
 make_build_args="mode=release werror=0"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://guillaumechereau.github.io/goxel/"
 distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz"
-checksum=98def0a77e90306023951b8171bf93458ef58663f1eca71201ed93b8fcdf332a
+checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index db6d59810086..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.3.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index caf54726953d..5071875a0123 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,20 +1,18 @@
 # Template file for 'gpodder'
 pkgname=gpodder
-version=3.10.21
+version=3.10.17
 revision=1
+wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject
- python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen
- python3-requests"
-checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils
- python3-pytest python3-pytest-httpserver python3-pytest-cov python3-requests
- which"
+ python3-html5lib python3-mygpoclient python3-podcastparser"
+checkdepends="${depends} python3-MiniMock python3-coverage desktop-file-utils"
 short_desc="Podcast client"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gpodder/gpodder"
-distfiles="https://github.com/gpodder/gpodder/archive/${version}.tar.gz"
-checksum=014e619de64d3e3dc8493929af8007b3caf09dd77e153bf778f1708d55946878
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=36a04e4d6a81f50b50d1f7691955d4f460e72f71b9519dad42b805a987434210
 
 do_check() {
 	make releasetest
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 336d135d1aa5..0ef1c4489c2f 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=45c5b4435555d8713bf49133304dadd49be940c4cbdc761be8ac13ad2c275493
+checksum=2257142b83296580eb0ffd5a600e7d0d3dc922bd746e2a57c8a6e4ad6285c5cd
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index d1931e5db446..ae3b209ffac7 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,14 +1,13 @@
 # Template file for 'graphviz'
 pkgname=graphviz
 version=2.44.0
-revision=2
+revision=1
 wrksrc="graphviz-stable_release_${version}"
 build_style=gnu-configure
 make_build_args="HOSTCC=$BUILD_CC"
 hostmakedepends="automake flex libltdl-devel libtool perl pkg-config"
 makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
  libXaw-devel"
-depends="liberation-fonts-ttf"
 short_desc="Graph Visualization Software"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index f3e4a1b60d21..e06a589de48a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.39.1
+version=1.39.0
 revision=1
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="024118069912358e60722a2b7e507e9c3b51eeaeee06e2dd9d95d9c16f6639ec
+checksum="b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6
  35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index b4ef83c7aa2d..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=4
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
deleted file mode 120000
index 870d493d73bf..000000000000
--- a/srcpkgs/gtk4-doc
+++ /dev/null
@@ -1 +0,0 @@
-gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6441fdf8e85c..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,58 +1,42 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.1
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
  -Dintrospection=$(vopt_if gir enabled disabled)
+ -Dprint-backends=$(vopt_if cups 'cups,file' file)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
+hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
+ pkg-config sassc gettext
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-gtk4-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-	}
-}
+build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index d8872a3b0347..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=4f69ce69a4c7ce8d456a744ff0af2cc35b624acdc00dca925073b057af8fe645
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8bbdd7ef97f6..e2883711310a 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -9,11 +9,10 @@ hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
  kitemmodels-devel ki18n-devel kdoctools-devel kparts-devel kwindowsystem-devel
  kiconthemes-devel knotifications-devel ksolid-devel libjpeg-turbo-devel
- exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel
- kio-devel kwidgetsaddons-devel"
+ exiv2-devel libkipi5-devel lcms2-devel baloo5-devel libkdcraw5-devel cfitsio-devel"
 short_desc="Fast and easy to use image viewer by KDE"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8d631791f532b7b674d0c701dd78395ff923c17683948ece5d7e17fe03c06f19
+checksum=726c75b60a71049378e1afee5cfd87957c8c1e4926d446ba993e9b13f2d647d2
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8e80af8f7268..324bd09dc6c3 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,8 +1,8 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.6.1
+version=4.6.0
 revision=1
-_tagdate=2021-07-25
+_tagdate=2021-05-22
 _widepix_commit=89dac47dbf874351e2d5a07a0bb33b7d1175ef28
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
@@ -17,8 +17,8 @@ homepage="https://www.zdoom.org"
 distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
  https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
  https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
-checksum="5d9f586f1eb1c2c3cbb4d86d0c64ed6b5640355dcc75c8defd57ab47e9a2c0c7
- 697044d938d91c5cb8976dea9ccb164d8b3bf595d3a09393aa12b7fb8e7208c5
+checksum="3c50fe9cffef497d6849d448abfeaa99d0f6d2bcd515d7b401c3ca2bb2ef6a91
+ dc77f6f9e5017830747f8e18a57b45013c1aaa845c3dce95d4c150fa69aa0096
  f86717925688fa7e7debcf88934bc3dc7f9bffbde4c533a34137069900b32c02"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 26bf2564421c..6992bc520ed3 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
 # Template file for 'handbrake'
 pkgname=handbrake
 version=1.3.3
-revision=4
+revision=3
 wrksrc="HandBrake-${version}"
 build_style=gnu-configure
 configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
diff --git a/srcpkgs/haproxy/files/haproxy.cfg b/srcpkgs/haproxy/files/haproxy.cfg
index 3706f7eb3ca3..039a2d1e0870 100644
--- a/srcpkgs/haproxy/files/haproxy.cfg
+++ b/srcpkgs/haproxy/files/haproxy.cfg
@@ -2,7 +2,6 @@ global
   chroot /var/lib/haproxy
   user haproxy
   group haproxy
-  stats socket /var/run/haproxy.sock mode 0600 level admin expose-fd listeners process 1/1
 
 defaults
   mode http
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..34307dbdaac9 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec haproxy -W -f /etc/haproxy/haproxy.cfg
+exec haproxy -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index f0f5aae0b411..b4e2d8929dc3 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.4.3
+version=2.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=ce479380be5464faa881dcd829618931b60130ffeb01c88bc2bf95e230046405
+checksum=@ef7a20a36812f119d0113a28e0b26b909f8177a224c840082295fae265ba1f81
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -26,7 +26,7 @@ do_build() {
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		atomic="-latomic"
 	fi
-	make ${makejobs} CC="$CC" DEBUG_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
+	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
 		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
 		USE_PROMEX=1 ADDLIB="$atomic"
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 9d8b01cf073f..ee03db31a273 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,20 +1,20 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.8.2
-revision=2
+version=2.8.1
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"
-makedepends="cairo-devel graphite-devel icu-devel libxml2"
+makedepends="cairo-devel graphite-devel icu-devel"
 short_desc="OpenType text shaping engine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
+checksum=4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 58d9bbb6e753..e02655aa7caa 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.26.1
+version=1.25.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=ba7fed423b2c437adfb4b98b2fdadaad6b6325f8e31cac2729982b7bf2523c81
+checksum=da5ac8d2b2f54acb56cfc68a37120f7e2171ee25a9fdd07445608436e0790593
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
deleted file mode 100644
index 9656bb88fadf..000000000000
--- a/srcpkgs/hello/template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'hello'
-pkgname=hello
-version=2.10
-revision=1
-build_style=gnu-configure
-short_desc="Friendly greeting program"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.gnu.org/software/hello/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index eafd273b8571..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.48.3
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=8361ff3c643fbd391064e97e5f54592ca28b880eaffbf566a68e0ad800d1a8ac
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,18 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://herbstluftwm.org"
+homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
-distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 5fcb79e3e351..dca5542d4485 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
-version=1.3.21
-revision=1
+version=1.3.19
+revision=6
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-2.1-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9ace3ef4a2ff2ca50a99be068b60fb1fdbc9eab8af53e345e97ce75ba4b63b56
+checksum=5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762
 nocross=yes
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..abd7b17ac15f 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
-revision=1
+version=5.5.2
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=989ef378e4c9f8234b62bb93d6a4b14bd4c98dc889519838dba1f44f12c51ed2
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 1965f18e9ea9..ab16766677cb 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.8.2
+version=4.7.5
 revision=1
 _build=1
 create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="custom:EULA"
 homepage="https://www.hopperapp.com"
 distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz"
-checksum=9992ed69eb526c2da95ce5f2a7357a448b4e05a19aff5da3f0157b77d030ebe3
+checksum=1ffd9272b8cfb615803dfa1e5347d3605c67b93466426cf5aa70b1bd52f0ba02
 
 archs="x86_64"
 restricted=yes
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 64c9d62a5a6b..ee9312836ce1 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.87.0
+version=0.85.0
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=04452df07f7cda063a93c7965f30dc7e50b30a4b1dfc42777cf9579d3b14318f
+checksum=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
 
 post_install() {
 	vdoc README.md
diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..57c01ceaabcb 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20210427
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=726c1f0a9c78689a4b7b30955269ee25793e861fc5c87b3d0552d5dabfaf31f5
 
 post_extract() {
 	unzip pl_PL.zip
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 63de64d6aba3..534115f34f0a 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.20.3
-revision=1
+version=0.20.2
+revision=2
 build_style=cargo
 make_check_args="--bins"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=8282fa2222f6b94f5c4ad7aa3c751e0638e5a902e6a901757640dbf7985b4a4b
+checksum=8e4a90813d66cf02a51d2d266524fb7b848dc35253b80508c89e49657bd1a83f
 
 post_install() {
 	vmkdir usr/share/i3status-rust
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index e6d37678c936..7c5ebcc18c90 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
-version=0.7.8
+version=0.7.7
 revision=1
 build_style=go
 makedepends="libXtst-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="ndgnuh <ndgnuh@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/BambooEngine/ibus-bamboo"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=39d4a1425feafe0fa3cb115a437acef36a1bf92e8c23530ebdbe75779891873e
+checksum=38b067d6406de128d32d9ae066a0747ad5f865583e15b4ae3508ccb8e8f13945
 conf_files="/usr/share/ibus-bamboo/data/macro.tpl.txt"
 
 do_configure() {
@@ -26,7 +26,6 @@ do_build() {
 do_install() {
 	vinstall ibus-engine-bamboo 755 usr/lib/ibus
 	vinstall bamboo.xml 644 usr/share/ibus/component
-	vmkdir usr/share/ibus-bamboo/
-	vcopy data usr/share/ibus-bamboo/data
-	vcopy icons usr/share/ibus-bamboo/icons
+	vinstall viet-on.png 644 usr/share/ibus-bamboo
+	vcopy data usr/share/ibus-bamboo
 }
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 381de5c102b5..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,27 +1,22 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
+version=2.0.0
 revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-setuptools"
-checkdepends="flake8"
 short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"
 
-do_check() {
-	./test.sh python3
-}
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 771f30d9d25f..189674ed9c8c 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.7.0
+version=2.6.0
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=2fce2efadd86843d052aa723a4d8f8cc6639068fa7336e93b7388a53ee471f28
+checksum=57e0ff25178fecd44cc92efba002a1ae13d6d2321cfb6bc1c3069e96b61a338b
 # broken tests
 make_check=no
 
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,7 +2,7 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
+version=67.1
 revision=2
 wrksrc=icu
 build_wrksrc=source
@@ -10,16 +10,12 @@ build_style=gnu-configure
 # use archive data instead of .so data for correct cross-compiling
 configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
-checkdepends="diffutils python3"
 short_desc="Robust and fully-featured Unicode libraries"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-
-CFLAGS=-fPIC
-CXXFLAGS=-fPIC
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
diff --git a/srcpkgs/icu4lua/patches/icu-68.patch b/srcpkgs/icu4lua/patches/icu-68.patch
deleted file mode 100644
index 6971b0490543..000000000000
--- a/srcpkgs/icu4lua/patches/icu-68.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/src/icu.ustring.c.orig
-+++ b/src/icu.ustring.c
-@@ -38,7 +38,7 @@
- 	target_limit = target + ICU4LUA_UBUFFERSIZE;
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_toUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_ZERO_ERROR:
- 				icu4lua_addusize(&build_buffer, target - temp_buffer);
-@@ -100,7 +100,7 @@
- 
- 	for (;;) {
- 		status = U_ZERO_ERROR;
--		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, TRUE, &status);
-+		ucnv_fromUnicode(conv, &target, target_limit, &source, source_limit, NULL, 1, &status);
- 		switch(status) {
- 			case U_BUFFER_OVERFLOW_ERROR:
- 				luaL_addsize(&build_buffer, (const char*)target - (const char*)temp_buffer);
-@@ -691,7 +691,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) < 0);
- 	return 1;
- }
-@@ -703,7 +703,7 @@
- 	lua_pushboolean(L, u_strCompare(
- 		icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 		icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--		TRUE
-+		1
- 	) <= 0);
- 	return 1;
- }
-@@ -733,7 +733,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) < 0);
- 	}
- 	return 1;
-@@ -759,7 +759,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) <= 0);
- 	}
- 	return 1;
-@@ -785,7 +785,7 @@
- 		lua_pushboolean(L, u_strCompare(
- 			icu4lua_trustustring(L,1), (int32_t)icu4lua_ustrlen(L,1),
- 			icu4lua_trustustring(L,2), (int32_t)icu4lua_ustrlen(L,2),
--			TRUE
-+			1
- 		) == 0);
- 	}
- 	return 1;
---- a/src/icu.utf8.c.orig
-+++ b/src/icu.utf8.c
-@@ -730,7 +730,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) < 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) < 0);
- 	}
- 	return 1;
- }
-@@ -746,7 +746,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) <= 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) <= 0);
- 	}
- 	return 1;
- }
-@@ -764,7 +764,7 @@
- 		UCharIterator iter_b;
- 		uiter_setUTF8(&iter_a, utf8_a, (int32_t)a_len);
- 		uiter_setUTF8(&iter_b, utf8_b, (int32_t)b_len);
--		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, TRUE) == 0);
-+		lua_pushboolean(L, u_strCompareIter(&iter_a, &iter_b, 1) == 0);
- 	}
- 	return 1;
- }
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
diff --git a/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
new file mode 100644
index 000000000000..da8fd053b556
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/0001-Revert-build-Check-for-.pc-files-before-using-them.patch
@@ -0,0 +1,32 @@
+From a1c5436d11e3e0dabc3cd236bf8175b13ac929cb Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <abc@pompel.me>
+Date: Fri, 23 Dec 2016 12:43:36 +0100
+Subject: [PATCH] Revert "build: Check for .pc files before using them"
+
+This reverts commit 78b4656fc24a1b21c948d8e68252f42df2a91735.
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8ded66..1d54698 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,14 +25,12 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
+ 
+ GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+ 
+-PKG_CHECK_EXISTS(udev, [], [AC_MSG_ERROR(udev development libraries are required)])
+ AC_ARG_WITH([udevrulesdir],
+ 	    AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+ 	    [],
+ 	    [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)"/rules.d"])
+ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+ 
+-PKG_CHECK_EXISTS(systemd, [], [AC_MSG_ERROR(systemd development libraries are required)])
+ AC_ARG_WITH([systemdsystemunitdir],
+ 	    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ 	    [],
+-- 
+2.11.0
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index e5f9af8aeca5..a47ca09e8b2d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,17 +1,20 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=3.1
+version=3.0
 revision=1
-build_style=meson
-configure_args="-Dsystemdsystemunitdir=false"
-hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
+build_style=gnu-configure
+hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
 distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cc594a68707bc0700f073753681da60edfddfbe5088e25d336f265a1eb944b2f
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
 
 post_install() {
 	vsv iio-sensor-proxy
diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index 42eb463d4359..206bf3cbccc6 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -5,10 +5,10 @@ revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
 depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter"
+checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy"
 short_desc="Lossless conversion of raster images to PDF"
 maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
 checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-make_check=no # depends on ImageMagick6
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 61cb15a40ce4..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.2
+version=1.7.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=c15eb370225e3e3c64a6421c3f153a4117958e0a3b395e06926568b4090aa425
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 9dc7717fbedc..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,6 +1,6 @@
 # Template file for 'imv'
 pkgname=imv
-version=4.3.0
+version=4.2.0
 revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, MIT"
 homepage="https://github.com/eXeC64/imv"
 changelog="https://raw.githubusercontent.com/eXeC64/imv/master/CHANGELOG"
 distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz"
-checksum=ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+checksum=7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
 conflicts="renameutils>=0"
 
 post_install() {
diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 84352b21d46b..0c72a0c69f6c 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8
+version=4.7.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=3625be33d28e67555de3339af5955c95c328681a0328ec5a074306d68af86cf7
+checksum=75bd55c36b5df82ced90812dd1dbc3f1a66094671d8a083d3f415d93b39fb835
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 4332867a7afc..bba897c240d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.2
+version=2021.1.3
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-212.4746.92"
+wrksrc="idea-IU-211.7628.21"
 depends="giflib libXtst jetbrains-jdk-bin"
 short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
-checksum=554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d
+checksum=d73e2266c85602f355179c53b72c6d7014c4d4e74437e25fe005f0f54d52878d
 repository=nonfree
 restricted=yes
 nopie=yes
@@ -30,7 +30,6 @@ post_extract() {
 	rm -rf lib/pty4j-native/linux/ppc64le
 	rm -rf lib/pty4j-native/linux/aarch64
 	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/arm
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 66de4b50be05..8d43ad4130d2 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=4
+revision=3
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"
diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 8c204026e90c..b95b5225e80f 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.15
+version=7.13
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751
+checksum=a11bdc78fbf174b6a293d76bc482d191d15fefe42949c933dd9c1e7e290dce4c
 
 libipset_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,11 +1,11 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20210202
 revision=1
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
-hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
+hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
 makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping
diff --git a/srcpkgs/iputils/update b/srcpkgs/iputils/update
new file mode 100644
index 000000000000..7b1c488b6339
--- /dev/null
+++ b/srcpkgs/iputils/update
@@ -0,0 +1 @@
+pattern='iputils-s\K\d+'
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index bad7086f050f..4233d5e56b43 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.4.3
+version=1.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://isync.sourceforge.net/"
 changelog="https://sourceforge.net/p/isync/isync/ci/master/tree/NEWS?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b4c720745bda3447fbd5b9f71783b23f699a55295917ae7586ee5c22e91b9708
+checksum=1935e7ed412fd6b5928aaea656f290aa8d3222c5feda31534903934ce4755343
 
 post_install() {
 	vsconf src/mbsyncrc.sample
diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template
index 24b5cfdd45ad..b0f12c03fa84 100644
--- a/srcpkgs/iverilog/template
+++ b/srcpkgs/iverilog/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex gperf"
 makedepends="readline-devel zlib-devel"
 short_desc="Verilog simulation and synthesis tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://iverilog.icarus.com/"
 distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz"
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 25210d5aa7ed..357b3296922b 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.8.2
+version=2.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,6 +13,6 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=102e1f559fe4e791cd1a456efd4c5b2c5893703285a881c54a8f55e437e95eff
+checksum=a69f0fa9be3dff7fa32d8a2ea3697ed828329b1db595fde23bbba5eab460d519
 # Tarball provides no tests
 make_check=no
diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index adc3be121904..2bb8940372c3 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,16 +1,16 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.1.0
+version=3.0.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket"
+depends="python3-jupyterlab_server nodejs python3-nbclassic"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab/archive/refs/tags/v${version}.tar.gz"
-checksum=bf4b279f110972c5ce585ede1f76165f0d7b06bd81acaab04ad56e9f0b5fafb4
+checksum=edc3f0c895cc3e0020551d933223dec93e779a2d25de26d26e90bc3e8e56339d
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index c6e27db93b52..4146819d4b8f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.15
+version=0.24.14
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=910ce32c3b2f8cf70fa41982e1d2a130e81fd826d43e4a4cee3a74e2f4c15541
+checksum=78e432824adb7ba6300784630f9cf371a379cc809b1cbb66aea0cc4fa07b3cf3
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 9171c8b668b9..32b88c77daa7 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=e67a36b779cd435a5913fd24233dae89368091cbed5bb41bf87c914c47bc034f
+checksum=e5e42fb65a6123bf86a3aa517c4c3436e666a64ccc5ed8c3a1cc1bb5de36962b
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index ff491f0439d5..03bd5aab28e4 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=af86d50851556fb719ad07707ca600a3a247c02034bf04bd285f003f74ddd475
+checksum=3fb4d1039559bdb47f2c56aa1c8069270dd26ca0651e7c213faa730d8bdc041d
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index f24acbd5db1e..9bfec8bb46da 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=e19779787585fe26e0eec62c0f9ba7c8cf0c68b1c21eb43ee37d344d15e6c523
+checksum=04ba923fc4d8a5ed94cf491fe89bb3e0921920f31de0d46c360a6ec6be0468d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index c1904742de40..ddca78341654 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f5891d94176178e0dcfebbeb97e80ed0b63a09a5312523156319cdd16fcc8030
+checksum=86b0909d486c5b5fc849bbf6dbdfff9deaf2f5764d3633e681e2d52d53ee3052
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index d9205c7a2330..a897424b124c 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db87d0eb15a81117e31937078b095939e23c375fd939fe0ac1d4edec31ada0ce
+checksum=5d47666f5d82771e7cf7d81e6063a912ecf44001199a25470b246e0244d250c4
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 26b77d8e318e..160f5a59ffb8 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0734864f64f18bf8bdce720c323b65e206170758f2385aa4b4f2a021f4c38aec
+checksum=8591e13aff17a7a5d9772b62f765672b7a72fe557623ac1d2f88d608c5aecb3f
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5bcace889805..4a137d395e92 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -19,4 +19,4 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ee7c28c7e26058635f8408f042defe67bbaacb1e7391a67a570196d061298602
+checksum=19a711d65fc63de2a1b41bfb70b62d1d3600ae790438ec08eea60fd550a6c9d1
diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 8b2f487c8aad..a800cedd9206 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b5b5efd13dac5e9be921bfed763462d738f9d916c65aa0f716d268e19f09bdb2
+checksum=a1bc4213ba36ac022957250bad69209100fffdb9e5a035876b02b0b75ed41141
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index ff488867bf7c..dab9e1652504 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c196e9195485622c7e5f4523584e1e7551827a0bfbe477d08d34b7847ab6b2f
+checksum=9a0cd78cb09ebbffafbc84865dc5125baf649b408ef86a440a17d84e529f5ef6
 
 karchive-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 34b059a7400b..8717280b0c3f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
+checksum=b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 14b65d36f780..0f7ee93f99f9 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a3a93c475aa3191a7a2e1746a4d54a5b08d24e8f99a36816d6db67e2b8961c5
+checksum=04c88ff501a60258fb1432edc81f7fe25794df4379dcfb9d6d6f71c8b2b29ecb
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 5d748d341059..128bd65dc31b 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36130d9347beee614574ee7f6030279d1c425bbcdca759826a174026eb532a4b
+checksum=ccbf74c3a281e7be60fadd08784a3be3c1e27f740fc0c3e7864396d2605575cc
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index a6accab96255..e1afa8c19090 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=7d09007ed2e91fe54e45956f40551938e528238e4f4c0a84ca6285ea497125af
+checksum=25d01173e31b8715bd1b22546ef9c39cf4f555d9860a106d34588bae55793926
 python_version=2
diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 2c2270301425..2447699df2bb 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=58fb1df9adac73fe8fd73f8a74ffe2c9ba8e7a6d196046aba56497471a77d912
+checksum=8b116cf5dff328597b74a550a938ce3e3a64fcbf7022c692b07691a9dbf35a19
 replaces="kcalcore>=0"
 
 do_check() {
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 26c10e049c35..64128ae04de3 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=3170d850f7586f8b8f8d3f375c79ce70858cea8c000429a6202e1dca68dbe8f9
+checksum=97f94d7e4ad428d05f07a9a6e89eb1e6278fc369d5c0947bcfb0f67f0f451be2
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index b3340820387c..9b6939ce5503 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=20e8a32f1f22bc0afc682b694c2d6d8333c9de796845904685269fb3719ece93
+checksum=eea7052e1424680d417981036d463916e2bdc55164a7161fa2d276f1348b93a9
 
 kcmutils-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ee5cada287d..c78bbf08f009 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65060af4bd3775aca56066f779ee4eeb34e05bf372023be2974302794e88f7fd
+checksum=233f7123b045562c8ea7862eb40c27e551f6b463f9ed4fce4583433601f9523a
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 0474a31e5ad5..f3ae72ca1d28 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=41baead36a7466b9184cf4bef2662e91b07f2bd1fe6a2753de0ad5b5550dc4ef
+checksum=7a9314d37c98a7c67f8e40af5c9c02b6bbfe2afdb0512f89edeee2c1860b72cd
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ceaccb292c25..09b6edeababa 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bad5482894d3dcf8bf213217c0a8bb7baba3803a737befcecaf83cda23dab962
+checksum=aa4a30c095ab365fa121cda18e0304bc9a0e774cf4b07a420ed534d221795073
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index b8f874258648..446d538cc2b6 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=79efd392d025c3cedbd24a7b0d336e50f5026a514312e862d61c8dc65a70a843
+checksum=36ea5e2263776f988a9b2301f4605ccb4b3683afbe770c1896a5525e12711e9e
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bcbc054d198c..a34e04c82828 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=134d0b10a17d386d00cfe25616e6410688e0f711dbbb52d992470ad31c82421e
+checksum=d4fe2aa8d4ab47e50d86f268e7aa8790b068eb7e80bae908423a57c7dd9e7a3f
 
 kcontacts-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 86ae8ff6b7a1..52af12a6e734 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90af5743a9e199e213e812313adf08c9034d1d79936565f22075ccb3f7445414
+checksum=754d3ca6efe5796f671d65a4529d2b3775187c8e26e78275b40a4b012c131fb0
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 604327d927c4..8fde5371a1c0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ee9404564e13d6a4463891d592d8e78bee2fa9caf8074708fc18b44ae8b41392
+checksum=65e78d1cd0ff6d7878d5e3e26e56f8ad75058f7ad5ee30f0e726af36293d592b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 825cec00e537..2e712db38ec6 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d3fb112066f30549d3d4173bd93555a26b047141a3e4661bcbbf862444a0e2a4
+checksum=36301040662a64bcc25b7833be61c5f3abf4f56f19ca65a621552fd445a8c610
diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index af46183798ff..1fd8a886343a 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=54035580be838237acac5e3c132f52293d4876640abfbfc23ade8196c26e9c87
+checksum=d81487836bb381da13bfb096e53f3a2e9c4eafb3e948a8de58065d76c2f19427
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdb/patches/kdb-fix-build.patch b/srcpkgs/kdb/patches/kdb-fix-build.patch
deleted file mode 100644
index a9a04ad493dc..000000000000
--- a/srcpkgs/kdb/patches/kdb-fix-build.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b36d74f13a1421437a725fb74502c993c359392a Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 16 Nov 2020 16:41:27 +0100
-Subject: [PATCH] Fix build with newer Qt
-
----
- src/KDb.cpp | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/src/KDb.cpp b/src/KDb.cpp
-index 5c3b601f..ee92c2ee 100644
---- a/src/KDb.cpp
-+++ b/src/KDb.cpp
-@@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type)
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
-             if (val < 32 || val >= 127 || val == 39 || val == 92) {
--                str[new_length++] = '\\';
--                str[new_length++] = '\\';
--                str[new_length++] = '0' + val / 64;
--                str[new_length++] = '0' + (val % 64) / 8;
--                str[new_length++] = '0' + val % 8;
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QLatin1Char('\\');
-+                str[new_length++] = QChar::fromLatin1('0' + val / 64);
-+                str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8);
-+                str[new_length++] = QChar::fromLatin1('0' + val % 8);
-             } else {
--                str[new_length++] = val;
-+                str[new_length++] = QChar::fromLatin1(val);
-             }
-         }
-     } else {
-         for (int i = 0; i < size; i++) {
-             const unsigned char val = array[i];
--            str[new_length++] = intToHexDigit(val / 16);
--            str[new_length++] = intToHexDigit(val % 16);
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val / 16));
-+            str[new_length++] =  QChar::fromLatin1(intToHexDigit(val % 16));
-         }
-     }
-     if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) {
--        str[new_length++] = '\'';
-+        str[new_length++] = QLatin1Char('\'');
-     } else if (type == BLOBEscapingType::ByteaHex) {
--        str[new_length++] = '\'';
--        str[new_length++] = ':';
--        str[new_length++] = ':';
--        str[new_length++] = 'b';
--        str[new_length++] = 'y';
--        str[new_length++] = 't';
--        str[new_length++] = 'e';
--        str[new_length++] = 'a';
-+        str[new_length++] = QLatin1Char('\'');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char(':');
-+        str[new_length++] = QLatin1Char('b');
-+        str[new_length++] = QLatin1Char('y');
-+        str[new_length++] = QLatin1Char('t');
-+        str[new_length++] = QLatin1Char('e');
-+        str[new_length++] = QLatin1Char('a');
-     }
-     return str;
- }
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch b/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
deleted file mode 100644
index 0de68b1e5de3..000000000000
--- a/srcpkgs/kdb/patches/kdb-mkspecs-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fc65f4fea459f8ab1f99c5ceb575fc8f4ea651a Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94@gmail.com>
-Date: Sun, 13 Dec 2020 19:16:30 +0530
-Subject: [PATCH] include KDEInstallDirs as first thing
-
-Otherwise ECMGeneratePriFile won't get correct paths and will install
-pri file in wrong place and things wanting to use kdb with qmake won't
-work.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3219e967..e3f98b43 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,12 +13,12 @@ kdb_add_tests(OFF)
- kdb_add_examples(OFF)
- 
- # ECM
-+include(KDEInstallDirs)
- include(ECMGeneratePriFile)
- include(ECMInstallIcons)
- include(ECMOptionalAddSubdirectory)
- include(ECMPoQmTools)
- include(ECMSetupVersion)
--include(KDEInstallDirs)
- include(KDECMakeSettings NO_POLICY_SCOPE)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(ECMSetupQtPluginMacroNames)
--- 
-GitLab
-
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 11b039b3b657..4f05af765ec9 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a60d24de1b6dae7c11b41453570cdba6ae501310f6dfcd9e41f1ea65fd141339
+checksum=85ee6b5a341197e2df822dfb132c6338dc2648785ad75406e6416b6ad0139b28
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 937dfcf16ce2..1642e3e66ec9 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=44e2e379ef8e3d09cc8ec4db5564dec3d42a48dfb690c4ae9438189cd4ba08ce
+checksum=040f75a3ec3cda88090edbade9b4e2c333a0bdc979e65b50f85d5cd05c31acf0
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 0f300600be07..2930fef7e503 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=a8df53067f2392e6c8e0d7a234771374d832a91c0fdfed1b3bd197797f5ea634
+checksum=c84bcdc88397e5db71285c6dca50ff495aa0b853c1ab3657aba4ca71170601d7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index ce089d21190b..868138cf8d80 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.08.0
+version=21.04.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 89d23991de1c..f195da674aad 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4de6001bb6cda802e1e7aee2a7254fa254ffdd38cb423344b2308108badbabe1
+checksum=26c7cea97973c242a34d511f8e41b1cebcfdbb864cce7570ec513af0b91cf779
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index c7b7cd872d90..9a78724762d0 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,17 +1,14 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
-configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="extra-cmake-modules qt5-host-tools
- pkg-config wayland-devel qt5-qmake python3 kdoctools
- qt5-wayland kcoreaddons gettext"
+hostmakedepends="extra-cmake-modules qt5-host-tools pkg-config
+ qt5-qmake python3 kdoctools kcoreaddons gettext"
 makedepends="kcmutils-devel qca-qt5-devel frameworkintegration-devel
  qt5-declarative-devel libfakekey-devel kwayland-devel
- qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel
- qqc2-desktop-style-devel pulseaudio-qt-devel"
+ qt5-multimedia-devel kpeoplevcard-devel kirigami2-devel pulseaudio-qt-devel"
 depends="kde-cli-tools qca-qt5-ossl fuse-sshfs kirigami2 qt5-quickcontrols"
 checkdepends="qca-qt5-ossl"
 short_desc="Multi-platform app that allows your devices to communicate"
@@ -19,5 +16,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=9a0a31dd1af88735edbb06cfe7e11f4a42b7b31f12afa79c6e7479130060b1e2
+checksum=fe5c857b588276cff575bbc0a6cf2b58da84cd4bcf6267b745f9f0b2c26ec28b
 python_version=3
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 35834b0744e3..e1b046b3444e 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=90e9bfeb2bd6afdd86ef8b18370a04d3e2e01841def635d25b349551a7a68031
+checksum=b760c5e5a6baf927589f2c1e38937a7963f0df17831747a12583f933227efead
 
 kdecoration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 9b21be7d32e9..41d1cecb0200 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c361952918e4f887a7db0ab202525488871ad8e4ea33715040ce89cd94f59f9
+checksum=4c96159e2f0255e4cefbfb671ac37d489bb70031536f098f3bc5f70559a6d330
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index fb46926635f0..2f4efec922ba 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=9c3a6cf3c6de3427d4ad7434dd21f77717b5aee94abe05bf29fb96a77e804fab
+checksum=c1b7a34542826e093bf0cb5ee9b9235c0d6f7acfb7f88f106c1edbd4651d706c
diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index f86887024b51..b7b60258515c 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a0d6232601b11995d68a6c178c390bf9d201df9148509bc2d938d0a381699fb0
+checksum=373f46d34b04cb6faeca577eaa67472a630b312af59d5851880623ecc0c671e2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 129b96eae6db..d8ec4da62191 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -13,7 +13,7 @@ makedepends="
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index b82b8106ba6a..eab83068c6eb 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ba8f2678f2a878d2fb08699bdeda2188ce54a5e9137c2e97bc282a8fb642ecdb
+checksum=749b7fc958d8187e236ac3fe4fa7c24631cee689da3db140350c9016e1de1836
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index d6709e9e961e..e8d8d27d3870 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=607206ef5153602433413a34202075dbb518299db094b0ad3b50b20f70258eba
+checksum=d0a62c1d8a4d2fd66028520f7bfc07e532f966366f754d435a0a52a9d3a6a3c1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 0b274f4bfc43..1d2b208ea692 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8ed96e2927d5b954ceb48c5f1d69e94d4439af987f5911489b55e4e3eb76905d
+checksum=5d091b325862b41eda9eecaecc4165db45078c507a5dc0e742cc3502a7bca14c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index b4bb8b2997f8..37b2bbab27cd 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08b4b25b956db0a9e0c5b712d19220aaa8433d29702e85d5c8f451979a9f1ff7
+checksum=2d752997389a57ee7f088c205ce225c5449fe574e061fab1672c33832496742c
 
 kdesu-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 23048d46218a..44e1ed2db5be 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=83b0eb5bf4db086315857493e928d4333843bd303e38d754a3ba8ceb38298293
+checksum=024b6ecbf1fe5f2938e166307b11010fe4c7d3ded082f3bf86f79157326e1266
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 75efb323317a..997b080751bc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=d4af3cd41b34a4dc3f3ef23238f9791f1470ce5362c2edbf6354e6ce1b0471de
+checksum=c01f85e383c11d65e55e83a25be39ee314f3bd9c5e3f02ba385f1c2dfa712db6
diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 5b4c765ae56c..8c70a18925f3 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1575b34bdd1fae9b2406ecc162e239d97128b6d143e3c82b028b362db1d93844
+checksum=a9761f167f302538aa466eb8ecf5f2c628dd07eaadb7d8a82511885a4063daab
 
 kdnssd-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 1a361d9f6b68..35b0ba3244d6 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c1c5505c42c221f2387b93e756c2d611f2494bb888af9c3d09993b57ccfd7d05
+checksum=97e653793227600aec3a2236b61018e9c8c2fcfe5b73c94836f206ea558d0df4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
new file mode 100644
index 000000000000..4c317ee41425
--- /dev/null
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@@ -0,0 +1,28 @@
+From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Fri, 6 Nov 2020 21:17:30 +0100
+Subject: [PATCH] fix-tests
+
+
+diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
+index 54df341..c07a310 100644
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
++++ b/src/kbookmarkmodel/tests/CMakeLists.txt
+@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ ###### kbookmarkmodeltest ######
+ 
+ set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
+-ecm_add_test(${kbookmarkmodeltest_SRCS}
+-    TEST_NAME kbookmarkmodeltest
+-    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
++add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
++add_test(
++    NAME kbookmarkmodeltest
++    COMMAND kbookmarkmodeltest
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
++target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
++
+-- 
+2.29.2
+
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index f686c5a690be..13f47fec262a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=0ee5639aef132899f0de909db8c56536b421273d7dee494fda24efc7410316fc
+checksum=2672ae455209a7be9020ae9021640131e8312c02d36674c64edccbb77df96e7a
diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index f6c68c41a11b..be9fbcd7f1b6 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ce7c97b7d50560adc069c08eecf0925df2ceb53e15804ae241851ec0088307e
+checksum=0733fe001a6257256326969e4e857e26883a03c2132794775d15f9d2f8a31141
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8b8486abe517..54c86c5c0073 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3d4ee4bfe3856917671c5f8c3c0f43b70e7ddee952f0afb4a8105749e217251e
+checksum=d170999ab1bfd3d4763453f987061292f9feae8e6f0174fc7eb2ef03ada646a5
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a43adab3b411..91b1488f06d6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=8f0a1609f2d6be32e29cb2c427480e05890e3dfba56a25510df337a79d304461
+checksum=9f42b5e79f5f262ac931385dd793d6bf42a1ba1ee9d45670dee5d9ca0813f663
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 5408fa7c7f46..ccc47bd5060d 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b59897426f941a2681aaf0b41b932c1da0e00efd9e7df8b919c730404cfd39
+checksum=4c27add40650c326f820bd013045b9b813b1cc4efb00fcf187bbc8bbc854f2ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"
diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 8ec8ab168258..fe948d173906 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e0dcfb844572c23b0504b9cca7b1d0a0f7f47e2f4469968754ca0045c8f0b438
+checksum=658e7e955606335372e1413c53db2102ba4207f189ad2b4fe3b4906bfa27726c
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index d25b4d6828de..8d8720e7b89b 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0cdad481d5564417fbcd2ee93a7c9e436bc63fb72eaad535d911b263261127b4
+checksum=2924e91c79a91c8f2714c5f75c13c269cc95595d028d8e3613dba142ebef285d
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 37c3a880b2a5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,6 +1,6 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.4
+version=0.10.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 968304987e8b..4d343ec7d101 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b148f680334fff1cda93fd9ae11e8c9ff8ced4e1db7ea561be24947eb91a2e96
+checksum=bb188fc826edfe48ee2625295d5c5737c62da406ec594691b6e664b3b9ed2fb6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 6262be84f6d2..fe2f0ca84e83 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=227a81d439b1d794b4c02f87e4401b43b5da6169039ca3f67834dc2f35b23d5b
+checksum=1a63c5e3f96a4e34b51261a9ffa71294a656f75111e9c551a1e382a8366dec3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 6615183f1d95..af4d8153d24a 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e8e191cbfc5b9b59e428aa3d08e2f8482b6d4b7e4dd26f37b4a7fa9b57eea1d2
+checksum=854edb9feca05ac891e13a6cbfadd9eecede38e0121fb767b44b732bc0b4e000
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 91840cb37eeb..0bfcf87cf5d2 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0fbd699cc002ae3db3e65e4dd07802d52127a0d5cd65fa77c5fdeb1bcad44955
+checksum=69af52a1dc40cd56213cb7d9675c17129f853611041c3d624afd93fe1cbd428e
 
 khtml-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 79201f2fca38..2c877d6c8e85 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=16b781a41e02341eeaef13dd0d7eb9dcacb5a491c53a6c8a9df0b2c17c6332c0
+checksum=603f1ee0d1e74afb0a2cc83a1415c126c59de9c977ec1632acc34fb76e976094
 
 ki18n-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 32ba74bfe113..e90a6a4934a6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97b592033ce8f46826824525c7c37915d3fb8b6bed32eb329aa18015ca88d64c
+checksum=f6dd5e7510217d71df871dc299a6a382e3adbe16f72c6c16b62b75a37b632065
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index af9a093cb6df..effde273ba73 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8e7513e4fc8e6581208cd67ce43ddcd88a542747c9446f23b6be31d6c64916cb
+checksum=52900b7df87eeb72c982124b9bb9061152c7367583ff55dbfcfe0b05a1ca904f
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 5708c8b337e0..1c54b7ca86a1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5ff404685d9854781d3f67c8875d4fdaf15cb2be9b12f450c45a7d7963cf94d9
+checksum=645fb3aa763f3c06091c359824b80c1dedc4012e0ea34ca7382ea55180fc732a
 
 kidletime-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index febeb317e2eb..d610520b0d0f 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=495129efbbd53e1d54c8562398f5d50d658474bcf05388060902957d59e85cd4
+checksum=af4e73e1b0e7dc4078fec4397a87b0043f4185ec9bd0d6b878ddcac8b7064bfb
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index beda10fe75c0..7d651c7059eb 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=50a61ac010acbde64f470cb3877403ca5aa11f70b9e54ede0a3bc09b02d40799
+checksum=badd15c93c1af2c6ab7f156245186a2223a184523070c6614328486e186eedf7
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index e42e43c42069..bc4167671a8d 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=89c08e52c0c59af61f839423242baf6c812148d54af0877252a634e07bebd163
+checksum=11cd07c0a1fdc57d7b22c1ffb034a4baf97a50f12641ca7a8b18efec4024fcdf
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 076a0a3c97eb..4321316b2dc5 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7cff6a49506f9dce828c486be0a473893533d37b0e801b5d580e763764f96e93
+checksum=6b3009206f0a44c4f93bfa89c1ad6a5ef8387de8d06e3e7e29adb59458846be2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"
diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 8dfc9aa52089..cce6a33917b3 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92dfdfc00ba87edb41d228906ea0d5e7ab5381c639845082e1019342cf8ca60e
+checksum=fca5dbe4b1646202ca5c2ee9c8f259514b17a633af318d57f225f1aa7616b128
 
 kinit-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 8c13608f1ff1..05a2627354b0 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=bd93d748c2883ff4cd64543516bbc90a66744db7b036075861e142d1a655486d
+checksum=4af9f8a10e0c16006d97cf63439f91c05a04533ec6ee2ec0223dbfcc1d39d62d
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 42b3794143f6..87416ec77c3c 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9feefdb711c927bf9dc0af557e10d96b3ffb1dcc3d8b4ca0ccbb794253ab72aa
+checksum=2e52a9539524b59b1127e14d024e9fb970100e1699772dc94c9222dd409b4631
diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index c1b480632f22..27c4a9d4c609 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4d58a7d2ae6530c4b676fe7f7e4583a86436c68861eb971bf91af9efead19f6
+checksum=96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 88dd3e27af33..fb6ae93be7cf 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=33d22381cf6058c3dc54109e31f710f07452ef9baf669d4264659c5c7fd7ad2b
+checksum=598c9e245d2726ada15c50d51f38827116f25d7e966af0cdfbb3bca396e01716
 
 kirigami2-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 741c5499b210..0ec0f9907068 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a1cd1610dc3a8d81caa1fc96554a75dc56d233299f9e7cc0ea4a3930da7a530
+checksum=da66a5608d2cffc6f465e963b3364e5faa81d88b19ca867e1004ca5202db29ec
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 062dff7273ec..1707f41deca8 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=802e0d665f4abe3933dc564d0a3b89c06868a1454e4b695f9ebeabbbef8e28bb
+checksum=8b4f2095e176738a26fdc1e31f0d30cbdef9ea1d9fa4a3ce80e8fe5261ad2a93
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index cf752b7a7c5e..c08d887702bf 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.23.1
+version=0.21.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=5190f5eeb4653ac2ca02885623fd3aa10da1c82260c5b9866614ef4fd7427856
+checksum=9d2ce82187e95626f6e4367b69a3142d0788f885873a90c0bef7acb000882b5d
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..fed972c83bc2 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.kiwix.org/"
 changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog"
-distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz"
+distfiles="https://github.com/kiwix/kiwix-lib/archive/${version}.tar.gz"
 checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then
diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 7d85faa4c6f7..a582bcd9c158 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-host-tools qt5-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34232f1dc1d44bdd7ec55a303f8ad8bc2b71e02b517b307dd17de5b897b8f715
+checksum=e5a2bb5cd1b6e5f81ce8f5b4d5d94707b3c1acc015bae771368f1f550f688d3d
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c88189b38369..c111a263ce5b 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=8b6bff4bae2206cc92b1b7d4f18641809086bcc7b2d83a2c3961987ed28ed446
+checksum=1e03d0f3eb091fea1e0c4809ec334cf8951576a0e45269e0fcde1e7ccdec2162
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"
diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 2777e0cc20e9..a0599558af0c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=413236f69e6c04fb3df05fb60847ee8fe51d8fd08d46abea79605e789ecb17c9
+checksum=6bc3ad5ca87eb9cf6b87885e06963fb9d9d46eb5a4d85d741326a8ef971163ab
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 1b0c8d8ef589..8f73aaf2e1df 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=99b96f321f7905b13e0f9f5cd56b7533ee499eba12dc2c62185b81cb3225e659
+checksum=7a8e8ba7ab4795eaab82736170ac1792d79675c702ad43ff088f97577988c238
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 050929a2716a..943aeb6c40fe 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7979cac5dc4a631c72eb5755ad7c762ebd32ad5fcb01e0d60d2b4577d9e80351
+checksum=2f7b61bd3f3aa47b9f8b2da578b5963d6ff2996259f85dc721b76417e2d9f0da
 
 do_check() {
 	dbus-run-session ninja -C build test
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d60bc5d08bb6..1d0a6514c6a1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=1a54ad02c834553036e0e2fa2df78118fdb8d99e48837c598fdd078c05cc0e91
+checksum=40659cd1b0773bb21f08ddc52a8d68ea1317660db276059851a60a5157b7c413
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 76e1ecab1829..e53ce5a73948 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=5cd4ba2b893c87136f88954caa758856b7a8d6e27e060046c9e9cad88be85d93
+checksum=cf96d78d5af7bb1f039681645885643851e06ae8299b3c4f218db39cfd336eea
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index b65b26a98436..a900262ed727 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,10 +1,10 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
- gettext kcmutils kdoctools kconfig kcoreaddons"
+ gettext kdoctools kconfig kcoreaddons"
 makedepends="kcalutils-devel knotifyconfig-devel kontactinterface-devel
  kparts-devel ktnef-devel libkleo-devel libksieve-devel mailcommon-devel
  messagelib-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=299486a0a7ffe2782c07b8a74612086a36824817c494c6cde88df0060b7dd4ca
+checksum=6b05ff369e8676e21588af8219bc9a3fe9aba5c24a3d1dc6f644a46ae68f30f1
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 550333029393..bf810b2b9a16 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=49816deaecef128c6b29d0807de925029fc48971a18e6c50954ccb76868332f6
+checksum=95b0d84d1f4b2fed2fbf643a858d375accb02ad732b71b88edc74f6a4416a88f
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index aae8726719e4..ab3c4e19a5bf 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=8aed28b29321f25271e0a3a423eb01164c90795d5951c335ac15b222997844f5
+checksum=791188973d3067fdcdaabab1ffd6d31f2370562c355a1b3478293c5adf74374c
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 8f9be660bdde..e117dcf0e19d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6632e59272e86e31890f187d24fd8a41120f743fb17d04b73e23453d1a11b2ae
+checksum=63efe6c2f1d61440713984dd37c42d4e30d0228c820df47e823830c6533bfdff
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index a5cb94248ad0..f5b19b2f56e9 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b243bc8bb2cba4eebff55e7a01be5c7790da1fafd88d17bad808e5ffc44d2a0
+checksum=bd8330bdf10e453ed13ee5c055ec496b0c6b090113a68fd5a97ef4bf2be8bbd1
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index b6c5b2145bfb..0bc10f28c014 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=b05789fc3ab2ec2cdce93813315dbc41dd49aed99ada3142cfa43e4357a1e9a5
+checksum=42923dc4f755909d49387f43bef79d72e44f1a187c85f95d5195db91a26e8d16
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 6f169788a94c..52e57d789abc 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=18977879e11bf1e70cd1d5b5417848c20e40022fed522c95ce58f0a5d516b7ad
+checksum=6a78baea78c23803c3822d965b8776f4975ee1a73fdae23e39b00defd36864bb
diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 6c15b266cee1..9eff87a5746d 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,17 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"
 makedepends="kio-devel kpackage-devel attica-devel"
-depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0c68fd75eb18d8c70ca27031b273774fe33c38c72fdf86254cfe3c09df620c9
+checksum=aea889085e662b1b3566f0beb62b01a3c4aa9f1d2b1076789dc7d14ec0392bf8
 
 knewstuff-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 4bf6eb337684..c4dc8cbb16e5 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=906ca9a31f40162543731a7dff73c58f7cd08d8362c2407cc5b23d764cdd09c3
+checksum=b699925ceb066bd610eddb44e63d39b18fb9309d01eee67b7f30b7475bd04e0c
diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 4015c0373adc..b4a39a09a30c 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,25 +1,24 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.0
-revision=2
+version=5.3.2
+revision=1
 build_style=meson
 configure_args="
  -Dclient=enabled
  -Dgroup=_knot_resolver
  -Duser=_knot_resolver
  -Dkeyfile_default=/var/lib/knot-resolver/root.keys
- -Droot_hints=/var/lib/knot-resolver/root.hints
- -Dkres_gen_test=false"
+ -Droot_hints=/var/lib/knot-resolver/root.hints"
 hostmakedepends="meson pkg-config protobuf-c"
 makedepends="LuaJIT-devel fstrm-devel gnutls-devel libedit-devel libknot-devel
- libuv-devel lmdb-devel protobuf-c-devel nghttp2-devel libcap-ng-devel libcap-ng-devel"
+ libuv-devel lmdb-devel protobuf-c-devel"
 checkdepends="cmocka-devel"
 short_desc="Full caching DNS resolver implementation"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=534af671b98433b23b57039acc9d7d3c100a4888a8cf9aeba36161774ca0815e
+checksum=8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 4c41e7638803..30e14c63e4c8 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.1
+version=3.0.8
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-dns.cz/"
 distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c
+checksum=df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"
diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 448c72232d83..91b2abe6c23c 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=255aef490cb178d63a692423e3ad341323153a91de7440152322366175492663
+checksum=b09c4d6091a793673019dbbe2d4934747f6a5b2cd5f78c59c054a189154a5f09
 
 knotifications-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 99c2b3e21727..8d3731c953cb 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dbd51384750c62881d0435db13a278dfb4699b31aa0c83a6cbbf7e924facf0aa
+checksum=c25fab67f21210cbcd79a8a89fc20f549586ae75df106a07e56a052598b8f2f4
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
deleted file mode 120000
index 355d1b91e520..000000000000
--- a/srcpkgs/kodi-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
new file mode 100644
index 000000000000..9f9deaf27059
--- /dev/null
+++ b/srcpkgs/kodi-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/xbmc
+	chown xbmc:xbmc var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
new file mode 100644
index 000000000000..83d2c7e37677
--- /dev/null
+++ b/srcpkgs/kodi-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+	rm -rf var/lib/xbmc
+	;;
+esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
new file mode 100755
index 000000000000..e4fc93b47edb
--- /dev/null
+++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+PATH=$PATH:/opt/vc/bin
+exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
new file mode 100644
index 000000000000..1e9d86040829
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
@@ -0,0 +1,20 @@
+--- a/xbmc/windowing/GraphicContext.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/windowing/GraphicContext.cpp	2020-01-16 21:15:35.293001948 +0100
+@@ -6,6 +6,7 @@
+  *  See LICENSES/README.md for more information.
+  */
+ 
++#include <cassert>
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2019-11-16 12:12:49.000000000 +0100
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp	2020-01-16 21:47:47.500101629 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "GUIDialogProfileSettings.h"
+ 
++#include <cassert>
+ #include <utility>
+ 
+ #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
new file mode 100644
index 000000000000..236bfa6fd0e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/filesystem/ZipManager.h.orig
++++ b/xbmc/filesystem/ZipManager.h
+@@ -33,6 +33,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdint.h>
+ 
+ class CURL;
+ 
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
new file mode 100644
index 000000000000..1c18a84c72ab
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
@@ -0,0 +1,37 @@
+--- a/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:31:51.519546398 +0100
++++ b/cmake/modules/FindCrossGUID.cmake	2019-01-30 18:32:51.197608565 +0100
+@@ -49,10 +49,10 @@
+   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
+   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
+ else()
+-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
++  find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
+ 
+-  find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
+-  find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
++  find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
++  find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
+ 
+   include(SelectLibraryConfigurations)
+   select_library_configurations(CROSSGUID)
+--- a/xbmc/utils/StringUtils.cpp	2019-01-30 18:35:42.588517593 +0100
++++ b/xbmc/utils/StringUtils.cpp	2019-01-30 18:37:38.058555463 +0100
+@@ -16,7 +16,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <androidjni/JNIThreading.h>
+@@ -1126,8 +1126,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
new file mode 100644
index 000000000000..369f1b24d76d
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
++++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
+@@ -36,7 +36,7 @@
+ 	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ 	cd $(PLATFORM); cp -a $(SOURCE)/* .
+ 	cd $(PLATFORM); ./autogen.sh
+-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
++	cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
+ 
+ 
+ $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
new file mode 100644
index 000000000000..6cce7a4d3524
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
@@ -0,0 +1,74 @@
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
+@@ -12,7 +12,7 @@
+ #define _onexit_t void*
+ #endif
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t __off_t;
+ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+--- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
++++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
+@@ -27,7 +27,7 @@
+ #endif
+ #include <dlfcn.h>
+ 
+-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+ typedef off_t     __off_t;
+ typedef int64_t   off64_t;
+ typedef off64_t   __off64_t;
+--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:29:02.249253971 +0100
++++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2019-01-30 19:39:34.911053272 +0100
+@@ -38,6 +38,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <paths.h>
+ #ifdef TARGET_POSIX
+ #include "PlatformDefs.h" // for __stat64
+ #include "XFileUtils.h"
+@@ -1480,7 +1481,7 @@
+     int ret;
+ 
+     ret = dll_fgetpos64(stream, &tmpPos);
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+     *pos = (fpos_t)tmpPos;
+ #else
+     pos->__pos = (off_t)tmpPos.__pos;
+@@ -1493,8 +1494,9 @@
+     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
+     if (pFile != NULL)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      *pos = pFile->GetPosition();
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    uint64_t *ppos = (uint64_t *) pos;
++    *ppos = pFile->GetPosition();
+ #else
+       pos->__pos = pFile->GetPosition();
+ #endif
+@@ -1509,8 +1511,9 @@
+     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
+     if (fd >= 0)
+     {
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
+-      if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
++    const uint64_t *ppos = (const uint64_t *) pos;
++    if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
+ #else
+       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
+ #endif
+@@ -1532,7 +1535,7 @@
+     if (fd >= 0)
+     {
+       fpos64_t tmpPos;
+-#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
++#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
+       tmpPos= *pos;
+ #else
+       tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
new file mode 100644
index 000000000000..98fa08aaffba
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fix-musl.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
++++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
+@@ -49,7 +49,7 @@
+ #ifdef  __cplusplus
+ extern "C" {
+ #endif
+-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
+ #define modify_ldt(a,b,c) syscall( __NR_modify_ldt,  a, b, c);
+ #else
+ int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
new file mode 100644
index 000000000000..5717746e09e1
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -462,7 +462,7 @@
+ // are actually #defines which are inlined when compiled with -O. Those defines
+ // actally call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions. 
+-#if _FORTIFY_SOURCE > 1
++#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
+ 
+ size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
+ {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
new file mode 100644
index 000000000000..ab008d445a99
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/ppc64.patch
@@ -0,0 +1,15 @@
+--- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
++++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
+@@ -32,6 +32,12 @@
+   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
+     set(ARCH aarch64)
+     set(NEON True)
++  elseif(CPU MATCHES ppc64le)
++    set(ARCH ppc64le-linux)
++    set(NEON False)
++  elseif(CPU MATCHES ppc64)
++    set(ARCH ppc64-linux)
++    set(NEON False)
+   else()
+     message(SEND_ERROR "Unknown CPU: ${CPU}")
+   endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
new file mode 100644
index 000000000000..76f6602063aa
--- /dev/null
+++ b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
@@ -0,0 +1,40 @@
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:51:15.744119125 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp	2019-01-30 19:54:51.940377340 +0100
+@@ -17,10 +17,6 @@
+ #include "platform/android/activity/XBMCApp.h"
+ #endif // TARGET_ANDROID
+ 
+-struct FILEWRAP : public FILE
+-{};
+-
+-
+ CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
+   m_file(NULL)
+ { }
+@@ -40,7 +36,7 @@
+   (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
+   (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
+ 
+-  m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
++  m_file = fopen(logFilename.c_str(), "wb");
+   if (!m_file)
+     return false; // error, can't open log file
+ 
+--- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:21.460002043 +0100
++++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h	2019-01-30 19:55:36.156814572 +0100
+@@ -10,8 +10,6 @@
+ 
+ #include <string>
+ 
+-struct FILEWRAP; // forward declaration, wrapper for FILE
+-
+ class CPosixInterfaceForCLog
+ {
+ public:
+@@ -23,5 +21,5 @@
+   void PrintDebugString(const std::string& debugString);
+   static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
+ private:
+-  FILEWRAP* m_file;
++  FILE* m_file;
+ };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
new file mode 100644
index 000000000000..d92a4f6217d8
--- /dev/null
+++ b/srcpkgs/kodi-rpi/template
@@ -0,0 +1,119 @@
+# Template file for 'kodi-rpi'
+pkgname=kodi-rpi
+version=18.8
+revision=6
+_codename="Leia"
+wrksrc="xbmc-${version}-${_codename}"
+build_style=cmake
+short_desc="Software media player and entertainment hub for digital media (RPi)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://www.kodi.tv/"
+distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
+LDFLAGS+=" -Wl,-z,stack-size=1048576"
+python_version=2
+
+nopie=yes
+archs="armv6l* armv7l*"
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ gettext-devel libltdl-devel python-devel libmariadbclient-devel
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
+makedepends="
+ libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
+ libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
+ libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
+ fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
+ fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
+ librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
+ libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
+ libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
+ flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
+ libinput-devel libxkbcommon-devel libcdio-paranoia"
+
+# gold broken with musl
+case "$XBPS_MACHINE" in
+	*-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
+esac
+
+configure_args="
+ -DCORE_PLATFORM_NAME=rbpi
+ -DENABLE_OPENGL=OFF
+ -DENABLE_OPENGLES=ON
+ -DENABLE_X11=OFF
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_VAAPI=OFF
+ -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
+ -DCMAKE_INSTALL_RPATH=/opt/vc/lib
+"
+case "$XBPS_TARGET_MACHINE" in
+	armv6*)   configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+		  LDFLAGS+=" -latomic";;
+	armv7*)   configure_args+=" -DWITH_CPU=cortex-a7";;
+	aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
+esac
+
+# The following dependencies are dlopen(3)ed.
+depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
+ librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
+depends+=" hicolor-icon-theme desktop-file-utils"
+
+provides="kodi-${version}_${revision}"
+
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,input,video"
+
+pre_configure() {
+	find -type f | \
+		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
+		xargs sed -i  -e "s;-isystem;-I;g"
+
+	. /etc/profile.d/10_openjdk11.sh
+
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			cat > cmake/modules/Find$i.cmake <<EOF
+				add_executable($i::$i IMPORTED GLOBAL)
+				set_target_properties($i::$i PROPERTIES
+				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
+				set_target_properties($i::$i PROPERTIES FOLDER Tools)
+EOF
+		done
+	fi
+}
+
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
+				make -C tools/depends/native/$i
+		done
+	fi
+}
+
+post_build() {
+	# Rebuild for target
+	if [ "$CROSS_BUILD" ]; then
+		for i in JsonSchemaBuilder TexturePacker; do
+			make -C tools/depends/native/$i clean all \
+				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
+				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+		done
+	fi
+}
+
+post_install() {
+	# remove unused stuff
+	rm -rf ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/lib -name "*.cmake" -delete
+	vsv xbmc-standalone
+}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
new file mode 100644
index 000000000000..c002e80531ce
--- /dev/null
+++ b/srcpkgs/kodi-rpi/update
@@ -0,0 +1 @@
+pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 16f5089a29aa..8f10f4f04887 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=3
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -156,9 +156,3 @@ kodi-devel_package() {
 		vmove usr/share/kodi/cmake
 	}
 }
-
-kodi-rpi_package() {
-	build_style=meta
-	short_desc+=" (transitional dummy package)"
-	depends="${sourcepkg}>=${version}_${revision}"
-}
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 0d4d55ac34a8..16982cd70b2c 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=df2da4a7a1dda0eaaeb1bedc198fecd0a55228d0f5288dae2606d523468bce58
+checksum=d825671f57454e455f20acd16326f38080bd343a74e1766ab7cd0f9e7fb2966e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 5a69f5ed3637..397c3ad1892b 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=6b2e0b8ab055bc65ebfaadc13aea4e4d81e7e9895703ac7be44abb8ff14b07d4
+checksum=66e9c1afb6edf53def7ba2d6c6ddf2f0353689ff6950f0c62b94d28a50324f2e
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index b78d3e4b66b1..432f416b54e4 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=5bdd16aadfe3e45a353dfac31c66cc769232f31dea8d4735a6de61f1384abebf
+checksum=bcb1fe3af641de857e2b2991f2ccb8a1fb5d5b46ebef57869b271f4ffb722b14
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index ad458eb6a3c9..5d486dd26f83 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=bff8684951ab22a7102b632a42f3d0456c3185022e166e03e34e414f844989be
+checksum=aa6e2e0a14fc960a9c9a46bcf3c7097de558168d60ec79d01c443bc0d55e9f85
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 9a7381d25361..1160895e97c5 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,16 +1,23 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.08.0
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel $(vopt_if qca 'qca-qt5-devel')"
 short_desc="User friendly IRC client for KDE"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="TheNumb <me@thenumb.eu>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=e8651d0309d4d5bc2f2341837ce2f056f33dca7d2788c2be592790cf126c5998
+checksum=14c53896848b870534ec83415a424a5b1a23f4f35040acb9caaad4fef7c52354
 python_version=3
+
+# Package build options
+build_options="qca"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="qca"
+fi
diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index f09749c6d380..e0b7811dedf6 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2c6c90e5a9b3c46fe0fad06ab58f7356447e3c90213882c8006683b59c13c93
+checksum=6761f2220e17e10afd6944cc58b3e8bdc3cb691e0098893299b827e20b62cc98
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"
diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 719ff2a4fea5..174d2b4ad975 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81751e7eaeed9658c2b7b59b7a612d866917bb09aaea3dd39ae21ed83a09fd1e
+checksum=deeda3f10b806b1822bed7573fb5f6c2ba76c465c8c76bbf85696f173af775b9
 
 do_check() {
 	: # test can not find packages assets?!
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 4c362e16727a..98715a3ed096 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=7fe0c679ee8e3f7045f6f125b8dd1b2b35b89a9ed70245a817894aeec4effaf2
+checksum=a612154477b5d7a6fbb7489f7b000c0eaf2bbdbcc6df16189e045354571bbbea
diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 2f9870e4d9bf..2bebfc4a9c9d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=65ba548dc9fd3a0c96bae150e5972b04be4963bce9d3cf2a1b2b8d24e5b2d60f
+checksum=77c0f36fb783ac17e63cbcacbb17e69750276bdba46e0524087eac6e4a7f8f52
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index ae6bedbf12a0..58b03357e86a 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f26950ff515f2edc51b1468e11dabfdec29b7754e4f44d942e76e52a6dd140e8
+checksum=da53943e0f3398f23dc81ff823a21742247fb7c46c429b7c67775a4f202b4253
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 2df5204090f2..fb5604b5646e 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aafdcac762a9ce52ba0ea2040a99a919439a043752d7f4b78aa0fce84460134a
+checksum=4ffd09a8c6b8713e02af4dfdc0bbc061d363c70448ef56b2cd4e4c768adfec00
 
 kplotting-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 3d2da25a160e..90071213a666 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=28c7ecf29b2cba3045d5047ee92e494fe0c0198b1e6dc34f03dddeb03ffdbffe
+checksum=62297b5a891f156d1bf7b0d8ed5996d40c30917800ebdabbfadcf32dccc70613
 
 kpty-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 76ae722205e9..b4ddcdedf730 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d79a761709a9537154bf3af146739e122e7b3c98ab1979de6606fb6a2fee8bf4
+checksum=2d91a4ea91a21b7e5125579eeaf8564102f579d5cf468a601921023c2b12862e
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index bc303c6edbf9..98c4527210fc 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=ae132e87d8b9ca6c927018d973f29cdc33d41ca387ee0911be887839f1c8cbc2
+checksum=afb11dca1bfefd3b503df21181ce19e10769d9e4079b9eea9489353437b30107
 
 do_check() {
 	cd build
diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 135a694e4e39..c54b3d71f40c 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ebc61d1b01d9f097128804b7031d1f5a34d426c19ed00faf96a1ccf108808592
+checksum=25784b487aded807a85d6ebd1f71f662e189855e6f59f7de7bf0c6b9bf5412de
diff --git a/srcpkgs/krita/patches/aarch64.patch b/srcpkgs/krita/patches/aarch64.patch
deleted file mode 100644
index ca73fa48f14e..000000000000
--- a/srcpkgs/krita/patches/aarch64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-We do already provide a desktop GL build of qt5,
-so assuming that AArch64 is a OpenGL ES platform
-is wrong for us
-
---- a/libs/ui/CMakeLists.txt	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-09 13:40:50.981311691 +0200
-@@ -7,12 +7,6 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
--if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
--    add_definitions(-DQT_OPENGL_ES_3)
--    add_definitions(-DHAS_ONLY_OPENGL_ES)
--    include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
--endif()
--
- add_subdirectory( tests )
- 
- if (APPLE)
diff --git a/srcpkgs/krita/patches/cross.patch b/srcpkgs/krita/patches/cross.patch
deleted file mode 100644
index b9e6138498bf..000000000000
--- a/srcpkgs/krita/patches/cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cmake/modules/SIPMacros.cmake	2021-08-03 10:57:54.000000000 +0200
-+++ -	2021-08-08 14:01:32.004000529 +0200
-@@ -124,8 +124,8 @@
- ENDMACRO(ADD_SIP_PYTHON_MODULE)
- 
- else()
--    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH})
--    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH})
-+    find_file(sip_generate "sip-generate.py" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+    find_file(pyproject_toml "pyproject.toml.in" PATHS ${CMAKE_MODULE_PATH} REQUIRED NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
-     macro(add_sip_python_module_v5 MODULE_NAME MODULE_SIP)        
-         get_filename_component(module_name_toml ${MODULE_SIP} NAME_WE)
diff --git a/srcpkgs/krita/patches/invalid-MimeType.patch b/srcpkgs/krita/patches/invalid-MimeType.patch
new file mode 100644
index 000000000000..ad1bc36f142c
--- /dev/null
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@@ -0,0 +1,11 @@
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
++++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+@@ -2,7 +2,7 @@
+ Categories=Qt;KDE;Office;Graphics;
+ Exec=krita %F
+ Icon=krita
+-MimeType=image/jpeg;jpeg/jfif
++MimeType=image/jpeg
+ Name=Krita
+ Name[af]=Krita
+ Name[ar]=كريتا
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 015a680e64b5..e909366f539d 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=4.4.7
+version=4.4.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://krita.org/"
 distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
-checksum=23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519
+checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 84546523107f..ab6cb073c9f2 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=7912af27a1592dbda72963fb4c2f036f222f2796c2080297ffbfecad5082f61d
+checksum=23b1cbe7cebad5a84ca5415b8f9d7459baa44a853533a9aef19f3813aac0e43b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 83a6e1fc42f3..9a19f2714add 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=a4d6e5a8a09ce61139f92d1eaae07d88a71090d1d144f5845b915643ea58e7af
+checksum=c9475f68518021c5731734269df04440c4b238046eeff05b7c446ba319eb4675
diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 555b5e25f8ae..f8dfcde1db63 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8dc01236134640daab49dcee77227a11d4582feb58e3c6856ca3e12caf31e4df
+checksum=37a8049e2161cfaa2659160fef0734c5a918a522ec40888fdca5c2b2530f5195
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 0de26ae4a40d..f202558398ca 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=27f8d52b52c3cee0b9def5bf2fc85916e29495b4b1e1d14dfd99f452ae3a7642
+checksum=56be75468c690b52b8ce01ee77b0d475c60c07460f2b17bc1b58439b072d5125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 9636fbaeeb61..f09268c68706 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=328570e8f08fc2a92fb4ce67e57e53ecf4cc6b28a0507ba031e340748632ec44
+checksum=d71992dbd57a1c7f3051a5b98898d791e9ae2db128b63843332d9e68f75d3285
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 834291b349c7..f8f2a92c3c16 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e2d1b7436a2bc8a73b4eec486bb8308a7997c65b981f88b17977bf15a5290b01
+checksum=c2e9c7a87aa7835d7bbfb0f45838a76151733547807a80c86df8307d79287dd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 05b954fd3047..ce4b29a14b1d 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=0b7447507d21f2c8f4cdccd4bae48b52216b58256de30ee12aaabf694532b5c6
+checksum=015ace6969a68fcfc0cbee227f8e386be2e4125a56b265f03d03e34a6232b508
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 46691f2b1fef..60fd29499e7d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a7e416de2c3d699fbaea1b8395be1a0ee50f0262303d47dc6b491ef0f36b8d3d
+checksum=9a7cbf477238eb6e804cafad5ecd3fa232531168c3ec227cc9bd64f78fae3153
 
 libksolid_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index a8904623a597..db7e67d19c05 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea4f3e8fd496cc92701b562e1dedcf1a8b174cdc71d4106f2322cdcc3cfc205
+checksum=d935bccdd20c18eefee7ce4f25d0c56a3ffe491839c58f79f5d7fb81e4f8f6ed
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 66e278038d8c..f6a379e0ffcb 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4b3dfe9c48985c8dcabe9545b67b571fde6a16107e52f7a665d07a9566e554a2
+checksum=70e8dbed3b88614e33115ad198c98edf3300f9e5f934528589a34796121d9587
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 9ac886b6ffd3..805e94c6e2d1 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6fefe801205558d823d09877ad561eb8c9685d2da3d4b4349b0b9f0d121a5fb5
+checksum=6adaec9e1d54fce3d990a67b6460edb1f36b5a4c3633a3b8b5fdd68c2ca3295c
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 161e4f500393..e5ca7479c5e4 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=2467a7cf001753b97d5c638949a36efa791fbdf439520e7dace2a5b00448b546
+checksum=93eb8280690c1b3ca4a4e2c2ef376d0761579148ca4aac26c995f63cd313c6c2
diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3e7da55c5243..e15e6d92e2b1 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d550711e98e1ebdfcb74840e55328ad4ab40e1a90038f6ae3f64d5c3d19fddc8
+checksum=3347c4efc2314ba5ca8b7b89495fe9d862a4e437d4abc025937e8cab8aa6d77e
 
 do_check() {
 	cd build
diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d87baffafd9f..32e1ed4fcbf9 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe1bac3c4a68bb97e8f0f003a6d59f0477012be5fd8ba13f885868e015931289
+checksum=d4e1213e5475ec2f58f51206ef0473e324f834c1735fc81e8e49399d5d983819
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 70b1974d9b40..d15680d6929b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=d47ca164216d39cb3520b66aaddf7127c5a424d3b848b9ac62131b9fd71de07e
+checksum=e71fa77fee033fb763f0f5c48164178f28521bda4271820457340f02fdbe5dda
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 3fb2b2494e38..95f46ea5c576 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.08.0
+version=21.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=aac1f84257c6c3c91756f8effe7ecd00eca16225e9ac73f286b244fba7c65297
+checksum=2afce9b62f13e650f4acc6bdbfeb394751ddcc023b21863cadd92a493c995b23
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 5d425f8f20fb..0c2b2b9b01ba 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=ce187fceaf4c279996c421506d3e85b88b49f0668a3085ea7a654107f9bf4a1e
+checksum=b565f3aba160fc2da08c1f3964d0be9340cb752979492c9bd5a8705ccfa36e92
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index d94a2a3afbb0..93d1c1bc3993 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
-version=1.21.3
+version=1.20.2
 revision=1
 archs="x86_64* ppc64le*"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="http://kubernetes.io"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=76efee33b02a85ea6e8e74dd7d95b9d5f78cdd29734c2d0f8a9bc0b20f20c755
+checksum=b83c0780efb182d928dc63d46488a847f161f04e40a94b96bf5247dd671ecdfc
 nocross=yes
 system_accounts="kube"
 make_dirs="/var/lib/kubelet 0755 kube kube"
@@ -21,7 +21,7 @@ conf_files="/etc/kubernetes/*"
 do_build() {
 	make
 	hack/generate-docs.sh
-	find "_output/local/bin/linux/" -type f -executable | grep "kubectl$" | egrep -v "gen|test" | while read line
+	find "_output/local/bin/linux/" -type f -executable | grep "kubectl" | egrep -v "gen|test" | while read line
 	do
 		$line completion bash > completion.bash
 		$line completion zsh > completion.zsh
diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 65e7553e7360..1a4041e07310 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1e0af3093cf376790a22ef80bf3df094c57ffcd9427da6ba73089e6a71ab9665
+checksum=aed3cacfcc5cef8f4f51b84bcf5f84f634b6871849471c9c73ba79c2f7601229
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 82485f2763c6..d9567e529663 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.1
+version=0.20.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=907d35451f683734b529c492fa867c792bee228a6a40cc6bc821034ab1989539
+checksum=c740b6a7a68b0c7c577fea983d40d4ae4277e1fd0dc62e5449f6e599597510b5
 
 post_install() {
 	vdoc doc/Theme-Config.pdf
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0cb96dd25730..a05672a75a86 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=984b805808640771795524a7e1a3862edc0f05925d3d19a37643efb9e5cb59d2
+checksum=af217af41ea10eb65e9ed171d84328b04f4e3ab6a791b69af61064fc72e14d74
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 65d82f8f3389..4c936f532b4f 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e79816c79dd88d9700bd8517a1248dd5a95b5a8dd278948389a11535506c6d14
+checksum=6c58517faaacbddaffe6118ecd3e05b78c0cec5936824800cb3cd10f04c208d4
 
 kwallet-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index cc8f89f18ed8..e3b6bb075cb2 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=70a2c00b1552384ca182eab9e5bbc2bb891fa7eff18a7266b28f00af40a59963
+checksum=3a7d8975d796d551a17466101281ef83f205984c9eb5e978a76cd1ca4c3e4890
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 98ebb198a89d..6e6ba14d63dd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb068ad16d5275e4875c8d53230e7974003733e7fc2db944522922bac700d49e
+checksum=3f5a3069026d4e71fd4c7ac47265862cc61550e8a72380e529343079c942ca24
diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 9f8a624a91f2..340e2d82c6da 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da167417221610d521fefbe4ae1322aa20e7d6ac782cadcb61972f915589767c
+checksum=d6b04984a3a1940d448b1cf78bbb895889718a7ed86222f14fb2b424a465bd30
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 46de4df6a625..8ec6a6f1e6d0 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621bb4cf10fa46d36cd2fd2c6b4e0a3bf3c4a61a9bb84418cc329d3d16bedf69
+checksum=fa084514b6e912c84194ff52e9ff3c834c0e12c35f10490b2103cbe5265ef5d2
 
 kwayland-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index bb133b36e569..4e0566d36b13 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61646fff0c2349bacbf3042f3aaaab460b8939b35157a72973885099d8160490
+checksum=778e63b0d2e7c8db472e40a95e2338c1270ac6222679a5023a170f35625dcef5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 860a20f4e894..25696bec47df 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b02a1c4c1f85d11f1206d364ffdcf242ba658046cb80751f0d769e15151aa3f4
+checksum=bc995b6c74ebfad98819cb595f2622ecae24e5a23964e9e646da5418ee016d0e
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 0c6a37793cc0..afca95e9da80 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6db43758f1508d30d840623b6c505aa3c8d326dd8fa60c9e9cdcd1feb469661e
+checksum=cf81e7f318eab437d12e822f6e04331ec1c76d15df56bb792e4460758944caa5
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 9f68371bd25c..2cce32e3793e 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9158fb7dc963e01c356cf5572910d72e2914a749e3dd46956898a35d1c5e73e5
+checksum=56daefff0fe0bdff3801393904be93325d63a9291acbcf0d571b8e4884ac7018
diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index f1e7da924f80..e0c2b7a7564c 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=253ae3984f2cc68165c683f5ac1f0a0417923d13673354e7ac8f156542cd3cb2
+checksum=2c3cbd25499dc51e45270c525a528efe16d26a07dc2047fa074708ceb9dcaeb5
 
 do_check() {
 	cd build
diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 7d6a7f194160..6486fdc52423 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a1196d626fba73c79a6c78470eb873a3ce0ab901696ed0751a21f8785cdbec84
+checksum=d15ca2c58d3db2ff66cb3a26ee20a481de42e0efa6a5ba47278da734956f4d82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt
diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index f81374deff25..0e7cdfb5c627 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.6.3
+version=1.6.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=7c251a309888579416fe1e15cb4a8ed438d5d7989465b804199089ddb5c9faa5
+checksum=9b131083f41e5e64221fc63cd342ed30034b90d439ee169edb4a1f0dbf8ea480
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 76afd6ef29f4..c862b593e21c 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1528e64b441f2c67c71f87785485644376391489fdef9a9de0c0034517993886
+checksum=d85ec7f7aa8a90fe454a4087cfebf17d1827ecf8871abd814f2e05621086ce4a
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
-   #define XF86XK_BrightnessAuto		_EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
-         return 1;
-     }
- 
-+    /* See if we can parse one of the _EVDEVK symbols */
-+    i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+        memcpy(prefix, key, (size_t)(tmp - key));
-+        prefix[tmp - key] = '\0';
-+        tmp += 3;
-+        memmove(key, tmp, strlen(tmp) + 1);
-+
-+        *val += 0x10081000;
-+        return 1;
-+    }
-+
-     /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
-      * immediately: if the target is in the form XF86XK_foo, we need to
-      * canonicalise this to XF86foo before we do the lookup. */
--- 
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 202fcdb18432..fa008a24b734 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.7.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 263597769d19..dd6263d3a420 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,6 +1,6 @@
 # Template file for 'libXft'
 pkgname=libXft
-version=2.3.4
+version=2.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,9 +8,9 @@ makedepends="xorgproto libXrender-devel freetype-devel fontconfig-devel"
 short_desc="Library for configuring and customizing font access"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://www.x.org"
+homepage="$XORG_SITE"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd
+checksum=225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-demo
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
deleted file mode 120000
index 0d8db913cd66..000000000000
--- a/srcpkgs/libadwaita-devel
+++ /dev/null
@@ -1 +0,0 @@
-libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index f7a101abbdc3..000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -22,7 +22,6 @@
- test_names = [
-   'test-action-row',
-   'test-application-window',
--  'test-avatar',
-   'test-bin',
-   'test-carousel',
-   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
deleted file mode 100644
index 6b49f233b3ec..000000000000
--- a/srcpkgs/libadwaita/template
+++ /dev/null
@@ -1,59 +0,0 @@
-# Template file for 'libadwaita'
-pkgname=libadwaita
-version=1.0.0alpha2
-revision=1
-_ver=1.0.0-alpha.2
-wrksrc="$pkgname-${_ver}"
-build_style=meson
-build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
- $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
- $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
-short_desc="GTK4 building blocks for modern adaptive applications"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="LGPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
-
-build_options="gir gtk_doc"
-build_options_default="gir gtk_doc"
-
-do_check() {
-	xvfb-run ninja -C build test
-}
-
-pre_build() {
-	# help gi-docgen find gi files on cross
-	if [ -n "$CROSS_BUILD" ]; then
-		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
-	fi
-}
-
-libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-			vmove usr/share/vala
-		fi
-		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/doc/libadwaita-1
-		fi
-	}
-}
-
-libadwaita-demo_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - demonstration application"
-	pkg_install() {
-		vmove usr/bin/adwaita-1-demo
-	}
-}
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..8bdf869f4ff6 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-blockchain'
 pkgname=libbitcoin-blockchain
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..f85033f35c63 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-client'
 pkgname=libbitcoin-client
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..6acd56e31682 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-database'
 pkgname=libbitcoin-database
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..39c2a55f6548 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-explorer'
 pkgname=libbitcoin-explorer
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..6a518b876664 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-network'
 pkgname=libbitcoin-network
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..7aa1706e85c7 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-node'
 pkgname=libbitcoin-node
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..8d45895873b7 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-protocol'
 pkgname=libbitcoin-protocol
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..0a949866e0c2 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-server'
 pkgname=libbitcoin-server
 version=3.6.0
-revision=4
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..7cf3a50675d1 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
 # Template file for 'libbitcoin-system'
 pkgname=libbitcoin-system
 version=3.6.0
-revision=4
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 763e662bf25a..cd498fb3ef79 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.52
+version=2.51
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97
+checksum=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/libcgroup/empty b/srcpkgs/libcgroup/empty
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..c9c19120e597 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,16 +1,17 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
-hostmakedepends="flex"
+configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
+hostmakedepends="flex automake libtool"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-only"
-homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+license="LGPL-2.1"
+homepage="http://libcg.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
+checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -19,6 +20,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
+pre_configure() {
+	autoreconf -if
+}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
new file mode 100644
index 000000000000..d395a5b230c3
--- /dev/null
+++ b/srcpkgs/libcgroup/update
@@ -0,0 +1 @@
+pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
deleted file mode 120000
index 28d87097fa2b..000000000000
--- a/srcpkgs/libdecor-devel
+++ /dev/null
@@ -1 +0,0 @@
-libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
deleted file mode 100644
index 3aa2069d4ab2..000000000000
--- a/srcpkgs/libdecor/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libdecor'
-pkgname=libdecor
-version=0.1.0
-revision=1
-build_style=meson
-configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols pango-devel
- $(vopt_if dbus dbus-devel)"
-short_desc="Client-side decorations library for Wayland client"
-maintainer="Arda Demir <ddmirarda@gmail.com>"
-license="MIT"
-homepage="https://gitlab.gnome.org/jadahl/libdecor"
-distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
-checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
-
-build_options="dbus"
-build_options_default="dbus"
-
-post_install() {
-	vlicense LICENSE
-}
-
-libdecor-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
deleted file mode 100644
index 1ed6b83b64aa..000000000000
--- a/srcpkgs/libe-book/patches/icu-68.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-      ^
-EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
-      TRUE, TRUE, &status)
-            ^
-
---- a/src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
-+++ b/src/lib/EBOOKCharsetConverter.cpp
-@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
-       m_converterToUTF8.get(), m_converterToUnicode.get(),
-       &outText, outText + out.size(), &inText, inText + length,
-       nullptr, nullptr, nullptr, nullptr,
--      TRUE, TRUE, &status)
-+      true, true, &status)
-     ;
-     if (status==U_BUFFER_OVERFLOW_ERROR)
-     {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=8
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index 6bec957dc867..104bd0679585 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.31.1
+version=0.30.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+checksum=c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
diff --git a/srcpkgs/libgnt b/srcpkgs/libgnt
new file mode 120000
index 000000000000..d5dc3b19c846
--- /dev/null
+++ b/srcpkgs/libgnt
@@ -0,0 +1 @@
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt-devel b/srcpkgs/libgnt-devel
index 28acf62a72ac..d5dc3b19c846 120000
--- a/srcpkgs/libgnt-devel
+++ b/srcpkgs/libgnt-devel
@@ -1 +1 @@
-libgnt
\ No newline at end of file
+pidgin
\ No newline at end of file
diff --git a/srcpkgs/libgnt/patches/cross-fix.diff b/srcpkgs/libgnt/patches/cross-fix.diff
deleted file mode 100644
index 060ced3d0c1f..000000000000
--- a/srcpkgs/libgnt/patches/cross-fix.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1084c82..7f824b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found())
- # Check for ncurses and other things used by it
- #######################################################################
- ncurses_available = true
--ncurses_inc = []
--# The order of this list is important to the condition that follows.
--ncurses_libs = [
--	compiler.find_library('ncursesw', required : false),
--	compiler.find_library('panelw', required : false),
--	compiler.find_library('tinfow', required : false),
-+ncurses_widechar = true
-+ncurses_header = 'ncurses.h'
-+# Some distros put the headers in ncursesw/, some don't. These are ordered to
-+# pick the last available as most-specific version.
-+ncursesw_header_paths = ['', 'ncursesw/']
-+ncurses = [
-+	dependency('ncursesw', required : false),
-+	dependency('panelw', required : false),
- ]
--if not ncurses_libs[0].found() or not ncurses_libs[1].found()
--	ncurses_available = false
--endif
--
--if host_machine.system() == 'windows'
--	# FIXME: $host ?
--	ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
-+if ncurses[0].found() and ncurses[1].found()
-+	foreach location : ncursesw_header_paths
-+		f = location + 'ncurses.h'
-+		if compiler.has_header_symbol(f, 'get_wch',
-+		    prefix : '#define _XOPEN_SOURCE_EXTENDED')
-+			ncurses_header = f
-+		endif
-+	endforeach
- else
--	ncurses_sys_prefix = '/usr'
--endif
--
--ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
--                    ncurses_sys_prefix + '/include']
--
--if ncurses_available
--	# Some distros put the headers in ncursesw/, some don't
--	found_ncurses_h = false
--	foreach location : ncurses_sys_dirs
--		f = location + '/ncurses.h'
--		if not found_ncurses_h
-+	ncurses_available = false
-+	ncurses_inc = []
-+	ncurses_libs = [
-+		compiler.find_library('ncursesw', required : false),
-+		compiler.find_library('panelw', required : false)
-+	]
-+	if ncurses_libs[0].found() and ncurses_libs[1].found()
-+		foreach location : ncursesw_header_paths
-+			f = location + 'ncurses.h'
- 			if compiler.has_header_symbol(f, 'get_wch',
- 			    prefix : '#define _XOPEN_SOURCE_EXTENDED')
--				if location != '.'
--					ncurses_inc += [include_directories(location)]
--				endif
--				found_ncurses_h = true
-+				ncurses_available = true
-+				ncurses_header = f
- 			endif
-+		endforeach
-+		if ncurses_available
-+			ncurses = declare_dependency(
-+			    include_directories : ncurses_inc,
-+			    dependencies : ncurses_libs
-+			)
- 		endif
--	endforeach
--
--	if not found_ncurses_h
--		ncurses_inc = []
--		ncurses_libs = []
--		ncurses_available = false
- 	endif
--else
-+endif
-+if not ncurses_available
- 	# ncursesw was not found. Look for plain old ncurses
--	# The order of this list is important to the condition that follows.
--	ncurses_libs = [
--		compiler.find_library('ncurses', required : false),
--		compiler.find_library('panel', required : false),
--		compiler.find_library('tinfo', required : false),
-+	ncurses = [
-+		dependency('ncurses', required : false),
-+		dependency('panel', required : false),
- 	]
--	ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
--	gnt_config.set('NO_WIDECHAR', true)
-+	if ncurses[0].found() and ncurses_libs[1].found()
-+		ncurses_available = true
-+	else
-+		ncurses_libs = [
-+			compiler.find_library('ncurses', required : false),
-+			compiler.find_library('panel', required : false),
-+		]
-+		ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found()
-+		ncurses = declare_dependency(dependencies : ncurses_libs)
-+	endif
-+	ncurses_widechar = false
-+endif
-+if not ncurses_available and host_machine.system() == 'windows'
-+	# Try pdcurses too.
-+	ncurses_header = 'curses.h'
-+	ncurses_libs = compiler.find_library('pdcurses', required : false)
-+	ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found()
-+	ncurses = declare_dependency(dependencies : ncurses_libs)
- endif
- if not ncurses_available
- 	error('ncurses could not be found!')
- endif
--
--ncurses = declare_dependency(
--    include_directories : ncurses_inc,
--    dependencies : ncurses_libs
--)
-+gnt_config.set('NCURSES_HEADER', ncurses_header)
-+gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar)
- 
- libgnt_SOURCES = [
- 	'gntwidget.c',
diff --git a/srcpkgs/libgnt/template b/srcpkgs/libgnt/template
deleted file mode 100644
index f362d1561357..000000000000
--- a/srcpkgs/libgnt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'libgnt'
-pkgname=libgnt
-version=2.14.2
-revision=1
-build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config glib-devel gtk-doc"
-makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc"
-short_desc="GLib Ncurses Toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://keep.imfreedom.org/libgnt/"
-distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz"
-checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75
-
-pre_configure() {
-	# disable doc for cross builds
-	if [ "$CROSS_BUILD" ]; then
-		vsed -i "/subdir('doc')/d" meson.build
-	fi
-}
-
-libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/libgnt.so
-	}
-}
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index a5d83a5a4615..7993283e1161 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=b6b4d6d7350f7651e220dd6db183d422a1bcb1eaf366d4a8a4d02a385cd9d882
+checksum=1765ba00be7e79a32188bc1c7736dee25e3600ef9df53a2bd070d2cdaeebe355
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 1972c5b8ad7c..d4812d123fd4 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.12.0
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
diff --git a/srcpkgs/libical/patches/fix-cross.patch b/srcpkgs/libical/patches/fix-cross.patch
index b8b024e392df..507c17ec3534 100644
--- a/srcpkgs/libical/patches/fix-cross.patch
+++ b/srcpkgs/libical/patches/fix-cross.patch
@@ -1,56 +1,24 @@
---- a/src/libical-glib/CMakeLists.txt.orig
+diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
+index f0eaf01..5fc7cc2 100644
+--- a/src/libical-glib/CMakeLists.txt
 +++ b/src/libical-glib/CMakeLists.txt
-@@ -1,25 +1,9 @@
+@@ -1,16 +1,10 @@
  add_definitions(-Dlibical_ical_EXPORTS)
  
- # build ical-glib-src-generator
--add_executable(ical-glib-src-generator
+-# build the src-generator
+-add_executable(src-generator
 -  tools/generator.c
 -  tools/generator.h
 -  tools/xml-parser.c
 -  tools/xml-parser.h
--)
--
--target_compile_options(ical-glib-src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
--target_link_libraries(ical-glib-src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
--
--install(
--  TARGETS ical-glib-src-generator
--  EXPORT IcalGlibSrcGenerator
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/libical
--)
--install(
--  EXPORT IcalGlibSrcGenerator
--  NAMESPACE native-
--  DESTINATION ${LIB_INSTALL_DIR}/cmake/LibIcal
 +add_custom_command(
-+  OUTPUT ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
-+  COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator
++        OUTPUT ${EXECUTABLE_OUTPUT_PATH}/src-generator
++       COMMAND /usr/bin/cc ${CMAKE_CURRENT_SOURCE_DIR}/tools/generator.c ${CMAKE_CURRENT_SOURCE_DIR}/tools/xml-parser.c -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -I${CMAKE_CURRENT_SOURCE_DIR}/tools/ -lxml2 -lglib-2.0 -o ${EXECUTABLE_OUTPUT_PATH}/src-generator
  )
  
- list(APPEND API_FILES
-@@ -72,22 +56,10 @@
-   list(APPEND xml_files ${xml_file_fullpath})
- endforeach()
- 
--if(CMAKE_CROSSCOMPILING)
--  # import native ical-glib-src-generator when cross-compiling
--  set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
--    CACHE FILEPATH
--    "Path to exported ical-glib-src-generator target from native build"
--  )
--  include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
--  set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
--else()
--  set(ical-glib-src-generator_EXE ical-glib-src-generator)
--endif()
+-target_compile_options(src-generator PUBLIC ${GLIB_CFLAGS} ${LIBXML_CFLAGS} -DG_LOG_DOMAIN=\"src-generator\")
+-target_link_libraries(src-generator ${GLIB_LIBRARIES} ${LIBXML_LIBRARIES})
 -
- add_custom_command (
-   OUTPUT ${LIBICAL_GLIB_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/libical-glib-private.h ${CMAKE_CURRENT_BINARY_DIR}/i-cal-forward-declarations.h
--  COMMAND ${ical-glib-src-generator_EXE} "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
--  DEPENDS ${ical-glib-src-generator_EXE} ${xml_files}
-+  COMMAND ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator "${CMAKE_CURRENT_SOURCE_DIR}/tools" "${CMAKE_CURRENT_SOURCE_DIR}/api"
-+  DEPENDS ${EXECUTABLE_OUTPUT_PATH}/ical-glib-src-generator ${xml_files}
- )
- 
- configure_file(
+ list(APPEND API_FILES
+   api/i-cal-array.xml
+   api/i-cal-attach.xml
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..913be53ef07f 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
-version=3.0.10
-revision=1
+version=3.0.8
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false
@@ -13,7 +13,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
 homepage="http://libical.github.io/libical/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=f933b3e6cf9d56a35bb5625e8e4a9c3a50239a85aea05ed842932c1a1dc336b4
+checksum=09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f
+disable_parallel_build=yes
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index baa82053faa5..bd946e222c28 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -6,10 +6,10 @@ build_style=gnu-configure
 hostmakedepends="pkg-config gperf"
 makedepends="zlib-devel"
 short_desc="ID3 tag library, part of MAD (MPEG Audio Decoder)"
-maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://sourceforge.net/projects/mad/"
-distfiles="${SOURCEFORGE_SITE}/mad/libid3tag/libid3tag-${version}.tar.gz"
+distfiles="http://distfiles.exherbo.org/distfiles/libid3tag-${version}.tar.gz"
 checksum=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 
 pre_configure() {
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index ef558a68d6a5..6361bb405ee7 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.18.1
+version=1.17.3
 revision=1
 build_style=meson
 configure_args="$(vopt_bool debug_gui debug-gui) -Ddocumentation=false -Dtests=false"
@@ -13,7 +13,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb
+checksum=0d010e0bf601b5d3a06b3c4d77d67751cf554f3e6448e57aa046ea9ee8f818ac
 
 build_options="debug_gui"
 desc_option_debug_gui="Build with debug GUI (GTK+3)"
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 916818e67d55..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.1
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 8f434c2de903..f267e3647406 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=fb328c07c5a471ed4eab362daf0c25a016de6c05a0d355268b603e4e494ddf00
+checksum=ec6b0c63dee52602b6c9c0ba9baa727731f0002a99e60b977b677facf1622922
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 2807f8951def..64afa6149368 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8c7244e9a0238a11e9ee9c2fc5592ad078325f55cc392bdf8b6c0a1989b8dc9c
+checksum=2b46d5abdec202a1167f072157aa0ff149480ed986e92b80db3b091eeb9d3706
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index fe37d8a34f5e..3d23b6d14697 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=2b55f9e2858cfeabfe8d1a8f3772bb0df88f583c65b4a4e3b0dc2a8db6ac7159
+checksum=779778724891e6f4228b02fd246c5948968d1562adae1708ac69cf8f548ee605
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index c9d22689b28c..dea1ddb1d778 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=e36ac18c55213f7f5f79f3fb7d3e1f518ace37f1c561a7fbcc8eeb470ffebebf
+checksum=5fd0fe9a01c764d3c191557c2dd4d71569cf912867c5bf36fcc79e94c11ff9b6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 9069aa997c98..29c834de2ad8 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=94e23d23190cb5c8046dbb6c87853312d2ed1cd59e5865c6549c396189c46555
+checksum=406fcd2fc5402250608d4a842f07b39edf82f7a9fb77d0d3bf4caf47b83de39f
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index bbea66be21d6..61cfdf975a1b 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=79b8834de9cebe68b8059042c775dc9446306919b63a31a082273fa0ca995e38
+checksum=0ee13f388097c34b1f00aca9fcba45638c2ac3ba068240842e4d76e87b971986
 
 do_check() {
 	:
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index cea014a80813..4117eda0a701 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=06341e62c05068f8fda0ac63790bde315e9eed40d4d4a522fb6a04c2cde96120
+checksum=c4065cd2d02cb2499abe62a677ff62bc49ecf05e250c23cfe664df8babee7f9d
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 2234221a9282..ace1e39ab733 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=77aa3100ec9a30c6085b5edc9efb1ebd44c7ae1216bf594c033f0d06e02e2692
+checksum=1beefb25c80231655017ff9c2af41d85f340af837cf1f520aec3793454ae5582
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 45d67934bc23..cff6281337b2 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=cbe35f706d1e2c2e73cfb6278f0c1f3c537d752c0452af85fd7cdd683784be2c
+checksum=b22c76364ac32f0b700b8c9f54e14e2d0e17b2487eac3bb347cbe14577d9743a
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 7f2793c1273e..c230b0a355d2 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a211b9b900ced93f506936bfb1e28ec19aa52ebec4cb08e8a15e382114fc557c
+checksum=01d03c3ab827a67e2bea55778e6e4e9d61639bf04208061219066a44d7ef10f2
 
 libkscreen-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 44e5e3590225..465a7c39532c 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=a78d3f5d87e97760fe5db91470cf7fafaa6c94a5785fbd5fe1f54d4047096564
+checksum=8393c9c3ee03af3d345438fc8dc9293705454a4a10c36478988a9c6cbcdbd95d
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 1c825b988d51..e9c424286e90 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80b1fb5ba0a2482700d46ecfb3e915380c120c09edc276333fee997ff4330692
+checksum=50b6f881483f3c66843a8506f66cd5bec190b7b980cf9d2ed84c774edea8596a
 
 build_options="webengine"
 
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..273439c90905 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"
diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-devel
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl
new file mode 120000
index 000000000000..235c8fb44d97
--- /dev/null
+++ b/srcpkgs/libmagick6-perl
@@ -0,0 +1 @@
+ImageMagick6
\ No newline at end of file
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index daabc077e556..28ded1e2b78e 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -1,6 +1,6 @@
 # Template file for 'libmbim'
 pkgname=libmbim
-version=1.26.0
+version=1.24.8
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -12,7 +12,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/libmbim/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1e1f0926b22c77210442129eca689722ecf324ab9c9abf421a5c989f46e813cf
+checksum=02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..5c96ba407069 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
diff --git a/srcpkgs/libnsl/template b/srcpkgs/libnsl/template
index d4f516f61ed9..ee2752000e8d 100644
--- a/srcpkgs/libnsl/template
+++ b/srcpkgs/libnsl/template
@@ -1,6 +1,6 @@
 # Template file for 'libnsl'
 pkgname=libnsl
-version=2.0.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake m4 libtool gettext-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-only"
 homepage="https://github.com/thkukuk/libnsl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40
+checksum=8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..5a90eaf22801 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index fc69bd9af9c9..f08066f12966 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.3.2
-revision=2
+revision=1
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 000000000000..c9c97cf67072
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libstemmer b/srcpkgs/libstemmer
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libstemmer-devel b/srcpkgs/libstemmer-devel
deleted file mode 120000
index 80a797598ae2..000000000000
--- a/srcpkgs/libstemmer-devel
+++ /dev/null
@@ -1 +0,0 @@
-snowball
\ No newline at end of file
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 55a2d9c23b05..0be82e73d963 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.6.0
+version=7.5.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e
+checksum=002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 3e139e9a4313..cfe7e2150eaf 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.6.0
+version=7.5.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+checksum=90107b49032c2f3022c84076c649135187fbc70c8efd16427c6c4b6d613c2895
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..3151a72d41dc 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 72eef6cd2627..94f82b23780c 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -1,18 +1,18 @@
 # Template file for 'libx86'
 pkgname=libx86
 version=1.1
-revision=8
+revision=7
 build_style=gnu-makefile
 make_build_args="BACKEND=x86emu"
 short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
-license="MIT"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="http://deb.debian.org/debian/pool/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
-checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
+license="Custom"
+maintainer="Orphaned <orphan@voidlinux.org>"
+distfiles="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$version.tar.gz "
+checksum=5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048
 archs="i686* x86_64*"
 
-CFLAGS="-fPIC -fno-delete-null-pointer-checks"
+CFLAGS="-fPIC"
 
 libx86-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -23,7 +23,3 @@ libx86-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
-post_install() {
-	vlicense COPYRIGHT
-}
diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 90fe3e9533cb..537a5f588923 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.1.0
+version=1.0.6
 revision=1
 wrksrc="${pkgname}-RELEASE_${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://libxlsxwriter.github.io/"
 distfiles="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_${version}.tar.gz"
-checksum=c74e6bed66158aaf86b2d624243c6d89cdbbbca406258ab5ef0d55e71381773e
+checksum=6217d2940a44c2eac3b48942e83e1320a871e47aabdb4047484426539e45e930
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
deleted file mode 100644
index b11c57daf9e7..000000000000
--- a/srcpkgs/libxml2/patches/icu-68.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
-From: Frederik Seiffert <frederik@algoriddim.com>
-Date: Thu, 12 Nov 2020 12:53:43 +0100
-Subject: [PATCH] Fix building with ICU 68.
-
-ICU 68 no longer defines the TRUE macro.
-
-Closes #204.
----
- encoding.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/encoding.c b/encoding.c
-index c34aca446..264f60bb4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..c334f505ed0c 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 659abee5ecc9..fe3c53109803 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.0
-revision=2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
diff --git a/srcpkgs/linux-base/template b/srcpkgs/linux-base/template
deleted file mode 100644
index 249f21fa27f2..000000000000
--- a/srcpkgs/linux-base/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'linux-base'
-pkgname=linux-base
-version=2021.07.21
-revision=1
-build_style=meta
-short_desc="Linux kernel base dependencies"
-maintainer="Érico Nogueira <ericonr@disroot.org>"
-license="Public Domain"
-homepage="https://voidlinux.org/"
-
-case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*)
-		depends="linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-	ppc*|armv7l*|aarch64*)
-		depends="linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
-		;;
-esac
diff --git a/srcpkgs/linux-lts/template b/srcpkgs/linux-lts/template
index cf200e66935f..ce6aace3950b 100644
--- a/srcpkgs/linux-lts/template
+++ b/srcpkgs/linux-lts/template
@@ -1,15 +1,25 @@
 # Template file for 'linux-lts'
 pkgname=linux-lts
-version=5.10
-revision=1
+version=4.14
+revision=2
 build_style=meta
-depends="linux${version} linux-base"
+homepage="http://www.voidlinux.org/"
 short_desc="Linux LTS (Long Term Support) kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org/"
+license="Public domain"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*|aarch64*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+esac
 
 linux-lts-headers_package() {
 	short_desc="Linux longterm support kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index 50ff91aef896..33463643fc20 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,15 +1,30 @@
 # Template file for 'linux'
 pkgname=linux
-version=5.13
+version=5.12
 revision=1
 build_style=meta
-depends="linux${version} linux-base"
 short_desc="Linux kernel meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-intel linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	ppc*|armv7l*|aarch64*)
+		depends="linux${version} linux-firmware-amd linux-firmware-nvidia linux-firmware-network dracut"
+		_depends_headers="linux${version}-headers"
+		;;
+	arm*)
+		depends="linux${version}"
+		_depends_headers="linux${version}-headers"
+		;;
+	*) ;;
+esac
+
 linux-headers_package() {
 	short_desc="Linux kernel headers meta package"
-	depends="linux${version}-headers"
+	depends="${_depends_headers}"
 }
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 8e1e1745b55a..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.203 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -681,7 +681,6 @@ CONFIG_NET_EGRESS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
 CONFIG_XFRM=y
@@ -3491,7 +3490,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 67421760be1b..c3e04295a50d 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.204
+version=4.19.198
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5
+checksum=be20a86c6638a35373472752c17fb09bbc0bfcc71c05454cb4cb224b94c9608e
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/linux4.19/templateu b/srcpkgs/linux4.19/templateu
deleted file mode 100644
index 3767d43fe13a..000000000000
--- a/srcpkgs/linux4.19/templateu
+++ /dev/null
@@ -1,331 +0,0 @@
-# Template file for 'linux4.19'
-pkgname=linux4.19
-version=4.19.203
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-license="GPL-2.0-only"
-homepage="https://www.kernel.org"
-distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0
-python_version=3
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-archs="i686* x86_64* arm* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage tar xz"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-# reproducible build
-export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
-export KBUILD_BUILD_USER=voidlinux
-export KBUILD_BUILD_HOST=voidlinux
-
-do_configure() {
-	# 4.19 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch subarch _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_args} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_args} defconfig
-		make ${makejobs} ARCH=$arch ${_args} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
-	local arch _cross _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-	esac
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* p*";;
-		arm|arm64) _args="x86* p*";;
-		powerpc) _args="arm* x86* parisc";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 m* s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols
-	msg_normal "$pkgver: extracting debug info, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux4.19-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux4.19-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-		vmove "boot/System.map-${_kernver}"
-	}
-}
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 59d695ee3dad..166ec208003b 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.58
+version=5.10.53
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210
+checksum=f0058d902933986dbaf03b2a0304d2babe5fe1c8e3f41f156ffd3c3f210106dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
@@ -41,7 +41,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.13/files/i386-dotconfig b/srcpkgs/linux5.13/files/i386-dotconfig
index dac04fe87a96..aa1278b6821d 100644
--- a/srcpkgs/linux5.13/files/i386-dotconfig
+++ b/srcpkgs/linux5.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.13.9 Kernel Configuration
+# Linux/i386 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2152,6 +2152,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3602,14 +3603,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_VMXNET3=m
 CONFIG_FUJITSU_ES=m
 CONFIG_USB4_NET=m
@@ -4281,7 +4277,7 @@ CONFIG_PTP_1588_CLOCK=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6480,9 +6476,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6520,7 +6514,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6678,7 +6671,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5616=m
@@ -8879,6 +8871,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9214,6 +9207,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/ppc-dotconfig b/srcpkgs/linux5.13/files/ppc-dotconfig
index 7e08591b96da..ad8478459b42 100644
--- a/srcpkgs/linux5.13/files/ppc-dotconfig
+++ b/srcpkgs/linux5.13/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.13.10 Kernel Configuration
+# Linux/powerpc 5.13.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -3138,14 +3138,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 # CONFIG_VMXNET3 is not set
 CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
@@ -3920,7 +3915,6 @@ CONFIG_CHARGER_BQ256XX=m
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
@@ -7386,6 +7380,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/files/x86_64-dotconfig b/srcpkgs/linux5.13/files/x86_64-dotconfig
index 184035eafa1c..4fac974c2420 100644
--- a/srcpkgs/linux5.13/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.13.9 Kernel Configuration
+# Linux/x86_64 5.13.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2220,6 +2220,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PSTORE is not set
 CONFIG_MTD_SWAP=m
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -3676,14 +3677,9 @@ CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
-
-#
-# Wireless WAN
-#
 CONFIG_WWAN=y
+CONFIG_WWAN_CORE=m
 CONFIG_MHI_WWAN_CTRL=m
-# end of Wireless WAN
-
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -4352,7 +4348,7 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 CONFIG_PTP_1588_CLOCK_VMW=m
@@ -6541,9 +6537,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
 CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
 CONFIG_SND_SOC_INTEL_MACH=y
-CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
-CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
-CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
 CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@@ -6555,7 +6549,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
@@ -6581,7 +6575,6 @@ CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
 CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
-CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_MTK_BTCVSD=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_PCI_DEV=m
@@ -6684,7 +6677,7 @@ CONFIG_SND_SOC_CS43130=m
 CONFIG_SND_SOC_CS4341=m
 CONFIG_SND_SOC_CS4349=m
 CONFIG_SND_SOC_CS53L30=m
-CONFIG_SND_SOC_CX2072X=m
+# CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
@@ -6738,7 +6731,6 @@ CONFIG_SND_SOC_RT298=m
 CONFIG_SND_SOC_RT1011=m
 CONFIG_SND_SOC_RT1015=m
 CONFIG_SND_SOC_RT1015P=m
-CONFIG_SND_SOC_RT1308=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT1316_SDW=m
 CONFIG_SND_SOC_RT5514=m
@@ -9035,6 +9027,7 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_BRCMSTB_RESCAL is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -9393,6 +9386,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/srcpkgs/linux5.13/template b/srcpkgs/linux5.13/template
index 5e633de474f4..be7bd8b88dff 100644
--- a/srcpkgs/linux5.13/template
+++ b/srcpkgs/linux5.13/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.13'
 pkgname=linux5.13
-version=5.13.10
+version=5.13.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9
- 0e0c65ad79ea2661cab8d89f811c903e8c87db12b1193f4a311dfaa3a266a625"
+ e83b798bfe22bc9d5e8115cd2bbff24cdf5fd0de1b423a3342985445b02668a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 
@@ -44,7 +44,7 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.devname"
 
 # reproducible build
-export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index b89dfe76536c..ea9cab58c2a7 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.140 Kernel Configuration
+# Linux/powerpc 5.4.123 Kernel Configuration
 #
 
 #
@@ -3649,7 +3649,6 @@ CONFIG_CHARGER_MAX77650=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_RT5033 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index db76c8c8845e..7aeca32a409f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.141
+version=5.4.135
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
+checksum=83efa4c8c725bd2a5e66e2db5612d0ee586449d36661d13889b9ddf0203efdf1
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
diff --git a/srcpkgs/lnav/template b/srcpkgs/lnav/template
index 464e0fc07e67..589905230dec 100644
--- a/srcpkgs/lnav/template
+++ b/srcpkgs/lnav/template
@@ -1,18 +1,18 @@
 # Template file for 'lnav'
 pkgname=lnav
-version=0.10.0
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake openssh zlib-devel"
-makedepends="bzip2-devel gpm-devel libarchive-devel libcurl-devel ncurses-devel
- pcre-devel readline-devel sqlite-devel zlib-devel"
+hostmakedepends="automake"
+makedepends="bzip2-devel gpm-devel libcurl-devel ncurses-devel pcre-devel
+ readline-devel sqlite-devel zlib-devel"
 short_desc="Log file navigator"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="http://lnav.org/"
 distfiles="https://github.com/tstack/${pkgname}/archive/v${version}.tar.gz"
-checksum=830805f4d9ed2ae749d500e50b8485771026a75fe055d00711ed8aa3af4f25a0
+checksum=b8b1a287af7794277ef1b75753fabd82d66f30a0d2ac202edfb01e932b05495d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -22,11 +22,7 @@ pre_configure() {
 	./autogen.sh
 }
 pre_build() {
-	make -C src/tools bin2c \
-		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
-		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
-		LDFLAGS= LIBS=
-	make -C src ptimec \
+	make -C src bin2c ptimec \
 		CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" \
 		CXX="$CXX_FOR_BUILD" CXXFLAGS="$BUILD_CXXFLAGS" \
 		LDFLAGS= LIBS=
diff --git a/srcpkgs/log4cpp/template b/srcpkgs/log4cpp/template
index d202e4fc2a49..0d8baea35fde 100644
--- a/srcpkgs/log4cpp/template
+++ b/srcpkgs/log4cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'log4cpp'
 pkgname=log4cpp
 version=1.1.3
-revision=2
+revision=1
 wrksrc="${pkgname}"
 build_style=gnu-configure
 configure_args="--disable-static --without-idsa"
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 3e5af4c38a16..5b2345a991d2 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.6
+version=0.8.5
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=9c6ef352bc4c43628d3be1d2416c2cd0ea6ac9e8ff837ae5bccfd6faaa47c92a
+checksum=0cc769b89e235c61caf38fde2f7e6bd2106e8e734d37b1ea321d96a130f04f04
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..84244374086e 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,8 +1,9 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
-revision=1
-wrksrc="lynx${version}"
+version=2.8.9.1
+revision=5
+_distver="${version%.*}rel.${version##*.}"
+wrksrc="lynx${_distver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
@@ -10,8 +11,8 @@ short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_distver}.tar.gz"
+checksum=a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e
 
 pre_configure() {
 	sed -i configure \
diff --git a/srcpkgs/lynx/update b/srcpkgs/lynx/update
new file mode 100644
index 000000000000..8079512abebb
--- /dev/null
+++ b/srcpkgs/lynx/update
@@ -0,0 +1,5 @@
+case "$version" in
+	*.*.*.*) version=${version%.*}rel.${version##*.};;
+esac
+
+ignore="*dev*"
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 35f9177b3048..7dd0f766de2b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=61ee90e73a3e5db02ae3336eab7c338ebb5fa13b2c0ad43babdbafcbb6572a2f
+checksum=45cc9bc3b19570c88756d247465f66b119e3aaeb887e8f82ff3495cdb27066b4
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 6ad5524055b2..d65697ef725c 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f1fdc85903cde153b49dcf6251bca35ee128d2b8a591c129b033b380a9d2a8d
+checksum=ffc7cc1b1ef99f3aefe7cc3d6e6a9a185a38c39ca41fed5de5c0dc76cde29c0c
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..f689a789e210 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 171ae1c373b1..efa8b676d395 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.08.0
+version=21.04.3
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=f40b5386f5502803f72a4551652e06be7b9f779e28113e058f08de9b9f11569f
+checksum=6e47ebb09c828b27645a2e29cc16be0d6439918141c5d04b9242c5877b1f5f65
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49fdd57a51f6..5faf8d334280 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.7.90
+version=5.7.40
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,15 +10,15 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=c141cb7ac27f615dd0c9325f194af59450f9e490677d29a33b656fae26aa9482
+checksum=63299ca30d863fe17837506dc9e00e2e4dbf1c1a61da92112a7c2f21d4d05812
 nostrip=yes
 repository=nonfree
 restricted=yes
 
 do_install() {
 	vlicense license.txt
-	vinstall masterpdfeditor5.desktop 644 usr/share/applications
-	rm {license.txt,masterpdfeditor5.desktop}
+	vinstall net.code-industry.masterpdfeditor5.desktop 644 usr/share/applications
+	rm {license.txt,net.code-industry.masterpdfeditor5.desktop}
 
 	vmkdir opt/master-pdf-editor-5
 	vcopy * opt/master-pdf-editor-5
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 86257c4735ec..2850d0700945 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,7 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
 reverts="2.17.0_1"
-version=2.16.11
+version=2.16.10
 revision=1
 wrksrc="mbedtls-mbedtls-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://tls.mbed.org/"
 changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog"
 distfiles="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${version}.tar.gz"
-checksum=51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
+checksum=78c02e2d277a302454ada90274d16d80f88d761bdd4243528e4206cf7920be78
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C
diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 380ceeb46467..6cb7381f281b 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.12
+version=0.4.10
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=d28b958c71a7934fde1c22204c3dc41ffc74df98c90afc1bf3ddafd131d4af77
+checksum=ecd1d4cee5b5fa7781799f83010e2074262929a22e37d308061b54ffa7e42f69
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 281f97ef6dd4..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,6 +1,6 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
+version=3.20.3
 revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 30857ffad05b..1f48965c139b 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -10,7 +10,7 @@ depends="python3 ca-certificates"
 checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2
  python3-Pygments"
 short_desc="Fast, lightweight source control management system"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 655b4bf4d45e..8443dbfc01e1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,8 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.1.7
+version=21.1.5
 revision=1
+wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb
+checksum=022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -151,10 +152,9 @@ fi
 _vulkan_drivers=${_vulkan_drivers/=,/=}
 _dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_gallium_drivers} ${_vulkan_drivers} ${_dri_drivers}"
 
 if [ "$_have_vulkan" ]; then
-	_have_zink=yes
 	configure_args+=" -Dvulkan-layers=device-select,overlay"
 	if [ "$_have_intel" ]; then
 		configure_args+=",intel-nullhw"
@@ -162,13 +162,6 @@ if [ "$_have_vulkan" ]; then
 	subpackages+=" mesa-vulkan-overlay-layer"
 fi
 
-if [ "$_have_zink" ]; then
-	_gallium_drivers+=",zink"
-	makedepends+=" vulkan-loader"
-fi
-
-configure_args+=" ${_gallium_drivers}"
-
 # must be the last one for proper order
 subpackages+=" mesa-dri MesaLib-devel"
 
diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
new file mode 100644
index 000000000000..3eefcff8e115
--- /dev/null
+++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
@@ -0,0 +1,11 @@
+--- a/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
++++ b/mesonbuild/modules/gnome.py	2020-06-29 19:00:15.000000000 +0200
+@@ -403,7 +403,7 @@
+ 
+     def _get_gir_dep(self, state):
+         if not self.gir_dep:
+-            kwargs = {'native': True, 'required': True}
++            kwargs = {'native': False, 'required': True}
+             holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+             self.gir_dep = holder.held_object
+             giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch
new file mode 100644
index 000000000000..8f73249b9f86
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-unittest.patch
@@ -0,0 +1,77 @@
+commit 777cbe9c0faa018bafccf3e7adb8dad162276e35
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Mon Feb 1 00:26:49 2021 -0300
+
+    tests/common: fix " 37 has function" test on musl systems.
+    
+    This commit fixes the test that asserts on whether the lchmod() function
+    should have been detected as available by Meson. It does so by assuming
+    that on Linux systems not using glibc, the function will be available.
+    
+    - fix comment about lchmod on Linux: musl has implemented the function
+    correctly since 2013, so the assumption in the test wasn't correct.
+    Furthermore, musl doesn't use glibc's stub mechanism.
+    - fix include to receive __GLIBC__ definition: including almost any
+    header in glibc will end up defining __GLIBC__, since most headers
+    include <features.h>. The <gnu/libc-version.h> header was probably
+    chosen because of its name, but its actual purpose is defining functions
+    for checking glibc version at runtime (instead of what the binary was
+    built with), so it isn't necessary to use it. Since it is a completely
+    non standard header, including it makes the test suite fail on musl due
+    to not finding the header.
+
+diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
+index 26f13d6fa..a59480c2d 100644
+--- a/test cases/common/39 has function/meson.build	
++++ b/test cases/common/39 has function/meson.build	
+@@ -44,11 +44,13 @@ foreach cc : compilers
+     error('Found non-existent function "hfkerhisadf".')
+   endif
+ 
+-  # With glibc on Linux lchmod is a stub that will always return an error,
+-  # we want to detect that and declare that the function is not available.
+-  # We can't check for the C library used here of course, but if it's not
+-  # implemented in glibc it's probably not implemented in any other 'slimmer'
+-  # C library variants either, so the check should be safe either way hopefully.
++  # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
++  # always return an error, we want to detect that and declare that the
++  # function is not available.
++  # We can't check for the C library used here of course, but the main
++  # alternative Linux C library (musl) doesn't use glibc's stub mechanism;
++  # also, it has implemented lchmod since 2013, so it should be safe to check
++  # that lchmod is available on Linux when not using glibc.
+   if host_system == 'linux' or host_system == 'darwin'
+     assert (cc.has_function('poll', prefix : '#include <poll.h>',
+                             args : unit_test_args),
+@@ -57,15 +59,24 @@ foreach cc : compilers
+     has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args)
+ 
+     if host_system == 'linux'
+-      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <gnu/libc-version.h>', args: unit_test_args)
+-      glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
+-      message('GLIBC vetsion:', glibc_vers)
++      # __GLIBC__ macro can be retrieved by including almost any C library header
++      glibc_major = cc.get_define('__GLIBC__', prefix: '#include <unistd.h>', args: unit_test_args)
++      # __GLIBC__ will only be set for glibc
++      if glibc_major != ''
++        glibc_print = 'hi "@0@" hi'.format(glibc_major)
++        message(glibc_print)
++        glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include <unistd.h>', args: unit_test_args)
++        glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor)
++        message('GLIBC version:', glibc_vers)
+ 
+-      # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
+-      if glibc_vers.version_compare('<2.32')
+-        assert (not has_lchmod, '"lchmod" check should have failed')
++        # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html)
++        if glibc_vers.version_compare('<2.32')
++          assert (not has_lchmod, '"lchmod" check should have failed')
++        else
++          assert (has_lchmod, '"lchmod" check should have succeeded')
++        endif
+       else
++        # Other C libraries for Linux should have lchmod
+         assert (has_lchmod, '"lchmod" check should have succeeded')
+       endif
+     else
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 48ca095572d9..bb484ec3e45e 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,8 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.58.2
-revision=1
+reverts="0.58.1_1"
+version=0.56.2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +15,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7
+checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 5c88da7b1c59..34e378b634cc 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=2fa24e72cc2dfedbb9b68e20260b5de46afc57087d6b37b512f2b1c71771aad0
+checksum=99e6a14c49903d2e3f950ba8ed9a8ceae06f0ce5315df8a67ef60e80a2325543
 
 #TODO: fix build without qca-qt5
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..8852268ba921 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,6 +1,6 @@
 # Template file for 'micro'
 pkgname=micro
-version=2.0.10
+version=2.0.9
 revision=1
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
@@ -8,12 +8,13 @@ go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
+hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"
-checksum=d849751fcd70eba48bf3e15c3cc665f818fe77e5ac7819d0afe2123dc258aedc
+checksum=59987763ec5edb10db50c136eeb5934b411bd5e6adbd3d785f1d64d3e225ec31
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 305cc7cccd9e..2b7dd627c36f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7aa04f355c7a9ac6ee089a17aa34d0607b230c9b09a3e99a57317f3fe44aca85
+checksum=3901b6e320c5f0618b112d27ec6e31854aeb80d9fd94ef37e826e461ad3e9e61
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 8933f760cd3d..1e7fd575868f 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.21
+version=2.9.20
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=6bb6a4a7853f538ab54893727fa217dd992b74698754abcf07a12b0227a22265
+checksum=8c32a04b258cc0a90a63e7109624b74f7d538aa217709b2d3e4287344cf47d95
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0ebfc4daa9a9..5b86cbf85393 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=60.0.0
-revision=2
+version=59.0.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=a12437790440589721e7cd8b476cb832ade6ad9f1759533ee8fe91bd9cfa74c4
+checksum=e92e6af241a34d2339c1909b3fc57acab8e6e94d51fee8c287975bc63cfc8453
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b77a3eb88d6f..a3d6685a95b0 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=52d82f24f41564436efa8829b36616bc77209c0e6e253ebcf0d9b0668c3862c9
+checksum=36f6341c4c9fa8dcd87484e75339b1b12dad31ef6b97733ccce1ad3ff05b0dcc
 
 do_check() {
 	cd build
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..9ab94af0fedd 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 163b2ab2d204..91eb32904c85 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.19.0
+version=1.18.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=23c365d319f0a53af81dd7d56f35e90c24ec32a21823c2f36c5d8c2d1edcdd6f
+checksum=db9bfc28355fe068c88b00974ca770a5449c7931b66f2895c9fbf2104d883992
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 06c060661d38..e401ff3d8733 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.28.1
+version=5.28.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c
+checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c
 
 pre_configure() {
 	./bootstrap
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 39d3b1d8a193..53ab96eca22e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -8,14 +8,14 @@ make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
 makedepends="c-ares-devel openssl-devel uthash libwebsockets-devel cJSON-devel"
-checkdepends="CUnit-devel python3"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
 license="EPL-1.0, BSD-3-Clause-Attribution"
 homepage="https://mosquitto.org"
 distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
 checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4
-make_check="ci-skip"
+# CUnit dependency is missing
+make_check=no
 
 system_accounts="_mosquitto"
 _mosquitto_homedir="/var/lib/mosquitto"
@@ -32,11 +32,6 @@ post_extract() {
 	esac
 }
 
-pre_check() {
-	# fd, addr = self._accept() # socket.timeout: timed out
-	vsed -i test/lib/Makefile -e /02-subscribe-qos/d
-}
-
 pre_install() {
 	sed -i 's,sbin,bin,g' */Makefile
 }
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 2325cfd80d99..0e1c2fda7f85 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,11 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.6
+version=0.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="gtksourceview4-devel gspell-devel"
+makedepends="gtksourceview-devel gspell-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=42559863b01d89bd21136beea0a1461530377fabc6553bdfe14399d55596350f
+checksum=40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..87e90b422b4e 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1e0f1fb6860a..6943fd07c09c 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.10
+version=0.22.9
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614
+checksum=f937403297c2240bd4a569f4b937ee7ab17398a5284ba9df4d6d4c3a0512bc64
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
new file mode 100644
index 000000000000..6e5e816b5ca9
--- /dev/null
+++ b/srcpkgs/mu/template
@@ -0,0 +1,36 @@
+# Template file for 'mu'
+pkgname=mu
+version=1.6.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config texinfo glib-devel"
+makedepends="xapian-core-devel gmime3-devel libuuid-devel"
+short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
+maintainer="Benjamin Slade <slade@jnanam.net>"
+license="GPL-3.0-or-later"
+homepage="https://www.djcbsoftware.nl/code/mu/"
+distfiles="https://github.com/djcb/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=d25ff84abe261948ef7226ee91b9559d1d842404c8187ee6ffafdc06673d6465
+
+if [ ! "$CROSS_BUILD" ]; then
+	hostmakedepends+=" emacs"
+else
+	configure_args+=" --disable-mu4e"
+fi
+
+pre_configure() {
+	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
+	autoreconf -fi
+}
+
+if [ ! "$CROSS_BUILD" ]; then
+	mu4e_package() {
+		short_desc+=" - Emacs frontend"
+		depends="${sourcepkg}-${version}_${revision} emacs"
+		pkg_install() {
+			vmove usr/share/emacs
+			vmove usr/share/info
+			vmove usr/share/doc/mu/mu4e*
+		}
+	}
+fi
diff --git a/srcpkgs/mu4e b/srcpkgs/mu4e
new file mode 120000
index 000000000000..4f9d522cd3ad
--- /dev/null
+++ b/srcpkgs/mu4e
@@ -0,0 +1 @@
+mu
\ No newline at end of file
diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template
deleted file mode 100644
index b27460c9cabe..000000000000
--- a/srcpkgs/mu4e/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'mu4e'
-pkgname=mu4e
-version=1.6.3
-revision=1
-wrksrc="mu-${version}"
-build_style=gnu-configure
-configure_args="--enable-mu4e $(vopt_if guile --enable-guile)"
-hostmakedepends="automake emacs libtool pkg-config texinfo glib-devel"
-makedepends="xapian-core-devel gmime3-devel libuuid-devel $(vopt_if guile guile)"
-short_desc="Maildir-utils indexer/searcher and associated Emacs client"
-maintainer="Benjamin Slade <slade@lambda-y.net>"
-license="GPL-3.0-or-later"
-homepage="https://www.djcbsoftware.nl/code/mu/"
-distfiles="https://github.com/djcb/mu/releases/download/${version}/mu-${version}.tar.xz"
-checksum=fe286eebc2d9a2060a67c365aed7dd7a6de1fe104f89da36976d8737200754b6
-replaces="mu<${version}"
-provides="mu-${version}_${revision}"
-
-pre_configure() {
-	sed -i 's,-I${prefix}/include,,' contrib/Makefile.am
-	autoreconf -fi
-}
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
deleted file mode 100644
index 39af72b0c5f9..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0bbe6c788938d1332609c014eeebc1dff966ac Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Mon, 26 Oct 2020 15:56:25 -0400
-Subject: fix pthread_cond_wait paired with with priority-inheritance mutex
-
-pthread_cond_wait arranged for requeued waiters to wake when the mutex
-is unlocked by temporarily adjusting the mutex's waiter count. commit
-54ca677983d47529bab8752315ac1a2b49888870 broke this when introducing
-PI mutexes by repurposing the waiter count field of the mutex
-structure. since then, for PI mutexes, the waiter count adjustment was
-misinterpreted by the mutex locking code as indicating that the mutex
-is non a non-recoverable state.
-
-it would be possible to special-case PI mutexes here, but instead just
-drop all adjustment of the waiters count, and instead use the lock
-word waiters bit for all mutex types. since the mutex is either held
-by the caller or in unrecoverable state at the time the bit is set, it
-will necessarily still be set at the time of any subsequent valid
-unlock operation, and this will produce the desired effect of waking
-the next waiter.
-
-if waiter counts are entirely dropped at some point in the future this
-code should still work without modification.
----
- src/thread/pthread_cond_timedwait.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index d1501240..f5f37af1 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,14 +146,13 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
--	if (!node.next) a_inc(&m->_m_waiters);
--
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
--	if (node.prev)
--		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & 128);
--	else
--		a_dec(&m->_m_waiters);
-+	if (node.prev) {
-+		int val = m->_m_lock;
-+		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
-+		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
- 	if (e == ECANCELED) e = 0;
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
deleted file mode 100644
index b356e38b61f8..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 27b2fc9d6db956359727a66c262f1e69995660aa Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 11:21:06 -0400
-Subject: fix missing-wake regression in pthread_cond_wait
-
-the reasoning in commit 2d0bbe6c788938d1332609c014eeebc1dff966ac was
-not entirely correct. while it's true that setting the waiters flag
-ensures that the next unlock will perform a wake, it's possible that
-the wake is consumed by a mutex waiter that has no relationship with
-the condvar wait queue being processed, which then takes the mutex.
-when that thread subsequently unlocks, it sees no waiters, and leaves
-the rest of the condvar queue stuck.
-
-bring back the waiter count adjustment, but skip it for PI mutexes,
-for which a successful lock-after-waiting always sets the waiters bit.
-if future changes are made to bring this same waiters-bit contract to
-all lock types, this can be reverted.
----
- src/thread/pthread_cond_timedwait.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index f5f37af1..a0cd4904 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -146,12 +146,17 @@ relock:
- 
- 	if (oldstate == WAITING) goto done;
- 
-+	if (!node.next && !(m->_m_type & 8))
-+		a_inc(&m->_m_waiters);
-+
- 	/* Unlock the barrier that's holding back the next waiter, and
- 	 * either wake it or requeue it to the mutex. */
- 	if (node.prev) {
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
-+	} else if (!!(m->_m_type & 8)) {
-+		a_dec(&m->_m_waiters);		
- 	}
- 
- 	/* Since a signal was consumed, cancellation is not permitted. */
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch b/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
deleted file mode 100644
index 2cc943f26f6a..000000000000
--- a/srcpkgs/musl/patches/fix-pi-mutex-cond-3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d91a6cf6e369a79587c5665fce9635e5634ca201 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 30 Oct 2020 16:50:08 -0400
-Subject: fix erroneous pthread_cond_wait mutex waiter count logic due to typo
-
-introduced in commit 27b2fc9d6db956359727a66c262f1e69995660aa.
----
- src/thread/pthread_cond_timedwait.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/thread/pthread_cond_timedwait.c')
-
-diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
-index a0cd4904..6b761455 100644
---- a/src/thread/pthread_cond_timedwait.c
-+++ b/src/thread/pthread_cond_timedwait.c
-@@ -155,7 +155,7 @@ relock:
- 		int val = m->_m_lock;
- 		if (val>0) a_cas(&m->_m_lock, val, val|0x80000000);
- 		unlock_requeue(&node.prev->barrier, &m->_m_lock, m->_m_type & (8|128));
--	} else if (!!(m->_m_type & 8)) {
-+	} else if (!(m->_m_type & 8)) {
- 		a_dec(&m->_m_waiters);		
- 	}
- 
--- 
-cgit v1.2.1
-
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index d30c99a563a0..a429ccaf999a 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
 pkgname=musl
 reverts="1.2.0_1"
 version=1.1.24
-revision=9
+revision=8
 archs="*-musl"
 bootstrap=yes
 build_style=gnu-configure
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7c7fbade75f2..0e036b303a35 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template
index 0c45112f40a8..43da90697848 100644
--- a/srcpkgs/neatvi/template
+++ b/srcpkgs/neatvi/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvi'
 pkgname=neatvi
-version=09
+version=08
 revision=1
 build_style=gnu-makefile
 short_desc="Small ex/vi editor"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://litcave.rudi.ir/"
 distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz"
-checksum=86ccff8e58a483e3d5cfcb71bec510726f2608cae7519ae9e97244b242af359f
+checksum=a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591
 
 alternatives="
  vi:ex:/usr/bin/neatex
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index ce6d5d318aa8..c27fbc9cef8f 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.95.01
+version=10.95.00
 revision=1
-_githash=311a6622e576349fdcf13a4b015911fab4d6f190
-_githash_guide=26d2e5a31a1567b7a70557d696efce7d71c87ff2
+_githash=ffa495eb1f02bfc0e5f83a17e917e8709ec41356
+_githash_guide=2c3fbc4db1aca945072feadb09436cd198e87999
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="03e3100ec4df4c6aa9562aa05cf0567e9f5f613992e0e06144121ef0f781e991
- 212627a1ae7e12df6844fa6a80e02fd7c3f0b3527e9312da9c7b69ee7ba31790"
+checksum="e110ea7f9114f9a82c9ecc1a208ed53fe09e8eef709d7197288c351be268e88f
+ 70f39f2cbce329f527efaf07992bafbe4881444e0578b3a2d9dce0a5e7320266"
 
 post_extract() {
 	cd $build_wrksrc
diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index dc7d2ffffe9b..6e6ef97dbee0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.85.0
+version=5.84.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d940bbe19c1b09fa9ed2c5e55dbd8bdd080ffdf7803603bb96c4d634573ce1d1
+checksum=e740c5774758cd86188c2584bb5dbaefe0777cae536bd3b6fc360709c545a5e1
 
 do_check() {
 	cd build
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..cd0b19da95c6 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=6
+revision=5
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -55,7 +55,6 @@ do_configure() {
 
 	./configure --prefix=${cfgdir} \
 		--conf-path=${cfgdir}/nginx.conf \
-		--with-compat \
 		--sbin-path=/usr/bin/nginx \
 		--pid-path=/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 7b7c6bfbf6e1..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.8.2
-revision=2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index fb454061f7c6..7b4e258a55e6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=7.6.0
+version=7.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=00852e8070415154197a5555ddae636e6e3940ecdd53d39ea69e5ff1531ba4c6
+checksum=f7499fbfb0658054f2732722d54fe31ea0f105fd9970b5bb6413a9cc065cb0eb
 
 do_build() {
 	make
diff --git a/srcpkgs/nodejs-lts-10-devel b/srcpkgs/nodejs-lts-10-devel
new file mode 120000
index 000000000000..2591e8fa6508
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10-devel
@@ -0,0 +1 @@
+nodejs-lts-10
\ No newline at end of file
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..21ec83101424
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- a/node.gyp
++++ b/node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
new file mode 100644
index 000000000000..dd2440b372b8
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -0,0 +1,29 @@
+--- a/configure.py
++++ b/configure.py
+@@ -848,7 +848,7 @@ def host_arch_cc():
+     '__MIPSEL__'  : 'mipsel',
+     '__mips__'    : 'mips',
+     '__PPC64__'   : 'ppc64',
+-    '__PPC__'     : 'ppc64',
++    '__PPC__'     : 'ppc',
+     '__x86_64__'  : 'x64',
+     '__s390__'    : 's390',
+     '__s390x__'   : 's390x',
+--- a/deps/v8/src/libsampler/sampler.cc
++++ b/deps/v8/src/libsampler/sampler.cc
+@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
+       reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
+ #else
+   // Some C libraries, notably Musl, define the regs member as a void pointer
++  #if !V8_TARGET_ARCH_32_BIT
+   state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
+   state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
+   state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
++  #else
++  state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
++  state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
++  state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
++  #endif
+ #endif
+ #elif V8_HOST_ARCH_S390
+ #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
new file mode 100644
index 000000000000..98e515cf4300
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
@@ -0,0 +1,41 @@
+Taken from Adélie Linux, fixes node on big endian ELFv2.
+--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
++++ b/deps/v8/src/ppc/assembler-ppc.h     2019-04-02 07:05:25.977213735 +0000
+@@ -48,7 +48,8 @@
+ #include "src/ppc/constants-ppc.h"
+ 
+ #if V8_HOST_ARCH_PPC && \
+-    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
++    (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
++      (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
+ #define ABI_USES_FUNCTION_DESCRIPTORS 1
+ #else
+ #define ABI_USES_FUNCTION_DESCRIPTORS 0
+@@ -60,13 +61,15 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
++#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+ #endif
+ 
+-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
++#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
++    (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
+@@ -220,7 +220,8 @@
+ // The following constants describe the stack frame linkage area as
+ // defined by the ABI.  Note that kNumRequiredStackFrameSlots must
+ // satisfy alignment requirements (rounding up if required).
+-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
++#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
++    defined(_CALL_ELF) && _CALL_ELF == 2)
+ // [0] back chain
+ // [1] condition register save area
+ // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
new file mode 100644
index 000000000000..300667cb9782
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/template
@@ -0,0 +1,96 @@
+# Template file for 'nodejs-lts-10'
+pkgname=nodejs-lts-10
+version=10.24.0
+revision=2
+wrksrc="node-v${version}"
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
+ $(vopt_if cares c-ares-devel)"
+checkdepends="procps-ng"
+short_desc="Evented I/O for V8 javascript (Dubnium)"
+maintainer="k4leg <d0xi@inbox.ru>"
+license="MIT"
+homepage="https://nodejs.org/"
+distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
+checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
+python_version=3
+
+build_options="ssl libuv http_parser icu nghttp2 cares"
+desc_option_ssl="Enable shared openssl"
+desc_option_libuv="Enable shared libuv"
+desc_option_http_parser="Enable shared http-parser"
+desc_option_icu="Enable shared icu"
+desc_option_nghttp2="Enable shared nghttp2"
+desc_option_cares="Enable shared c-ares"
+build_options_default="ssl libuv http_parser icu nghttp2 cares"
+
+replaces="iojs>=0"
+conflicts="nodejs nodejs-lts"
+provides="nodejs-runtime-0_1"
+
+if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="host and target must have the same pointer size"
+fi
+
+CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+do_configure() {
+	local _args
+
+	export LD="$CXX"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _args="--dest-cpu=arm" ;;
+			aarch64*) _args="--dest-cpu=arm64" ;;
+			ppc64*) _args="--dest-cpu=ppc64" ;;
+			ppc*) _args="--dest-cpu=ppc" ;;
+			mipsel*) _args="--dest-cpu=mipsel" ;;
+			mips*) _args="--dest-cpu=mips" ;;
+			i686*) _args="--dest-cpu=x86" ;;
+			x86_64*) _args="--dest-cpu=x86_64" ;;
+			*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+		esac
+		_args+=" --without-snapshot"
+	fi
+	./configure --prefix=/usr --shared-zlib \
+		$(vopt_if icu --with-intl=system-icu) \
+		$(vopt_if http_parser --shared-http-parser) \
+		$(vopt_if ssl --shared-openssl) \
+		$(vopt_if libuv --shared-libuv) \
+		$(vopt_if nghttp2 --shared-nghttp2) \
+		$(vopt_if cares --shared-cares) ${_args}
+}
+
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
+	else
+		make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
+	fi
+}
+
+do_check() {
+	make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
+}
+
+do_install() {
+	make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
+	rm $DESTDIR/usr/include/node/openssl -rf
+	vlicense LICENSE
+}
+
+nodejs-lts-10-devel_package() {
+	short_desc+=" (development files)"
+	conflicts="nodejs-devel nodejs-lts-devel"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
new file mode 100644
index 000000000000..fd924949cea2
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/update
@@ -0,0 +1,2 @@
+site="https://nodejs.org/download/release/latest-v10.x/"
+pkgname="node"
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
-revision=1
+version=12.21.0
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 575278170b27..1c226d51ce1a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.17.2
-revision=2
+revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
diff --git a/srcpkgs/noise-repellent/patches/fix-cross.patch b/srcpkgs/noise-repellent/patches/fix-cross.patch
deleted file mode 100644
index 5818349fb9b0..000000000000
--- a/srcpkgs/noise-repellent/patches/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/meson.build	2020-01-04 02:27:45.000000000 +0100
-+++ b/meson.build	2021-08-10 16:17:03.828663592 +0200
-@@ -17,19 +17,19 @@
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
-+cflags = ['-fomit-frame-pointer','-fno-finite-math-only']
- cflags += ['-Wno-unused-function']
- 
- #install folder
- install_folder = 'nrepel.lv2'
- 
--#get the build operating system and configure install path and shared object extension
--current_os = build_machine.system()
--current_arch = build_machine.cpu_family()
-+#get the host operating system and configure install path and shared object extension
-+current_os = host_machine.system()
-+current_arch = host_machine.cpu_family()
- 
- # Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
--    cflags += ['-msse','-msse2','-mfpmath=sse']
-+if current_arch == 'x86_64'
-+    cflags += ['-ffast-math','-msse','-msse2','-mfpmath=sse']
- endif
- 
- # Add osx multiarch flags when appropriate
diff --git a/srcpkgs/noise-repellent/template b/srcpkgs/noise-repellent/template
index c064532d6540..a682812b9d9b 100644
--- a/srcpkgs/noise-repellent/template
+++ b/srcpkgs/noise-repellent/template
@@ -1,8 +1,8 @@
 # Template file for 'noise-repellent'
 pkgname=noise-repellent
-version=0.1.5
+version=0.1.4
 revision=1
-build_style=meson
+build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lv2 fftw-devel"
 short_desc="LV2 plug-in for broadband noise reduction"
@@ -10,4 +10,4 @@ maintainer="Colin Gillespie <colin@breavyn.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/lucianodato/noise-repellent"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=5f83a1ac4ddb7f92934041f0b5576ad37932bb81e3eb767f2aea78c9f8cfcaae
+checksum=19a2a899b740dd81775f09e03bc09b010725b3366219296f488425beb632c243
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index c9ca266b1ca1..989de0f270be 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.1.3
+version=1.1.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=5e94e4c06cdc18916e9c0d5f0e8c2130d6cfd2ac
+_git_commit=a6fab0f1df962b9224adcf05c886c6ae59d52192
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=18eb2b7fcd4d32952546b3d8b052e755dedc4c63e36527404db6abdce01b197d
+checksum=441d2f50a29568451cb16301a2208c9b744a480ded8c624e789983ee42ed3ea9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) go_build_tags+=" nonvidia" ;;
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 0023919a6ace..278c10f6d9bf 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.3.13
+version=2.3.11
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=c5eb822ea5b98028acd4a8dd21b155f893d928e4a30a8309eea0c406403af4e8
+checksum=9cdd868c6546cf1c2cf800ed2a054139b7377527493cdc4b71aced860de0d670
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9512a55f958d..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.69
+version=3.68
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 7d796f02024c..dd6f06a99117 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=4.2.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"
diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template
index 0e4ba1c87c84..d1f2ae62f5e0 100644
--- a/srcpkgs/nv-codec-headers/template
+++ b/srcpkgs/nv-codec-headers/template
@@ -6,7 +6,7 @@ archs="i686* x86_64*"
 wrksrc="nv-codec-headers-n${version}"
 build_style=gnu-makefile
 short_desc="FFmpeg version of headers required to interface with Nvidias codec APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MIT"
 homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
 distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz"
diff --git a/srcpkgs/nvidia/INSTALL b/srcpkgs/nvidia/INSTALL
deleted file mode 100644
index 2461dca609f6..000000000000
--- a/srcpkgs/nvidia/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-case "${ACTION}" in
-post) ldconfig -X || : ;;
-esac
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1a4e10bd5bec..2ebd8c1b5e49 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=470.63.01
+version=470.57.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>24_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=6f1a44cc4a2ce27dce749ccd1e403c1db0f4791e2d22c05ec966842101d3ed14
+checksum=55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
 # subpackages need to be processed in this specific order
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs nvidia-libs-32bit"
 depends="nvidia-libs-${version}_${revision}
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 08ba298b09dd..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,33 +1,19 @@
 # Template file for 'octave'
 pkgname=octave
-version=6.3.0
-revision=1
+version=5.2.0
+revision=2
 build_style=gnu-configure
-hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel"
+configure_args=" --with-blas=openblas --with-lapack=openblas"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
+ lcms2-devel glpk-devel"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
-checkdepends="zip unzip"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
-
-# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
-# on all others.
-case "$XBPS_TARGET_MACHINE" in
-	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
-		makedepends+=" openblas-devel"
-		configure_args=" --with-blas=openblas --with-lapack=openblas"
-		;;
-	*)
-		makedepends+=" blas-devel lapack-devel"
-		;;
-esac
+checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
 
 # Package build options
 # TODO: some options are still missing, such as
@@ -79,7 +65,7 @@ makedepends+="
 	$(vopt_if curl libcurl-devel)
 	$(vopt_if fftw3 fftw-devel)
 	$(vopt_if graphicsmagick libgraphicsmagick-devel)
-	$(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+	$(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
 	$(vopt_if hdf5 hdf5-devel)
 	$(vopt_if imagemagick libmagick-devel)
 	$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 905c81f78714..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=3.0.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffd41b748e5a451d42d2eb3d29c0557a9eb4aaa435fca016e43a75ffedc67761
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index f251b18c9e1c..30626aa8aa78 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dded73111fa78a9b7f544d6089de2cc0c48b1696c723ba76ab2dab8fd9c16a69
+checksum=fa1fc1a4a4d84c1e568665d4c05cd00f71c5ba481dad7b6b8d83597a428b5056
 
 do_check() {
 	cd build
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 12a46936c990..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.olivevideoeditor.org"
 distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
new file mode 100644
index 000000000000..4a1754648932
--- /dev/null
+++ b/srcpkgs/onionshare/template
@@ -0,0 +1,23 @@
+# Template file for 'onionshare'
+pkgname=onionshare
+version=2.2
+revision=5
+build_style=python3-module
+pycompile_dirs="/usr/share/nautilus-python/extensions"
+hostmakedepends="python3-setuptools"
+depends="python3-Flask-HTTPAuth python3-pycryptodome python3-PyQt5
+ python3-pysocks python3-requests python3-stem tor"
+short_desc="Share files anonymously and securely"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://onionshare.org/"
+changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
+distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
+checksum=7173863d7582b05aa8fd0d2207236e3cbbb38d854aad65e3b98ec5baad521fc2
+
+conf_files="/etc/apparmor.d/local/*"
+
+post_install() {
+	vmkdir etc/apparmor.d
+	vcopy "apparmor/*" etc/apparmor.d/
+}
diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 7547a3281f08..c06f3dda3557 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
-version=2.1.0
-revision=1
+version=2.0.8
+revision=3
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-only"
 homepage="http://opam.ocamlpro.com"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
-checksum=456df1988dcad8a5ee99f4fe1f8791edc04df93225dbeb3d51bf87c5f47769a8
+checksum=846d595107949ccd4a144c970406b608762174df712a3d5571af704167dd8090
 nocross=yes
 disable_parallel_build=yes
 
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 17b0c7e7b293..27b4fe86d906 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -1,6 +1,6 @@
 # Template file for 'openbsd-netcat'
 pkgname=openbsd-netcat
-version=1.217.1
+version=1.217
 revision=1
 wrksrc="netcat-openbsd-${version%p*}"
 hostmakedepends="pkg-config"
@@ -12,8 +12,8 @@ homepage="http://packages.debian.org/sid/netcat-openbsd"
 distfiles="
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version%p*}.orig.tar.gz
  ${DEBIAN_SITE}/main/n/netcat-openbsd/netcat-openbsd_${version}-1.debian.tar.xz"
-checksum="5c529616bbca6a0dfbac034b1087db7518d8a79a7308f0f816caac17571f1e9a
- e004532826240ac958c59b5d6a9cd81db36738790a81575362d1708284a5328e"
+checksum="fcb551d9987fd51d020c62b6d81df0c2bb17ce1887bbc3fda4d28313791cc0f5
+ c18cec8f286cd77828cdcf6412c6a3a9686f97cfdb47fd7dde4af392a21ab352"
 
 alternatives="
  nc:nc:/usr/bin/openbsd-nc
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 955517561869..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.0
-revision=1
+version=1.16.0
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0dd37a63f499abfc2b81152d67fdba8d2b1218c8b9176bf10193d6579f285454
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 7120d39bae20..c73913b4e9d7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.1
+version=1.4.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=9088966685a78adf24b8de075d66e4c0019bd7b2b9d29c6e45aaf35d294e3f6f
+checksum=3e7b85d344b3635719879c4444f061714e6e799895110bd5d78a357dc9b017db
 
 do_check() {
 	build/oidnTest
diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 0ae052a88f75..558f7e19e8fb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.13.8
+version=0.13.7
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=5c2750d12630f325b292c87b30cbba390ca881226026a9386530572ebb1e3eb7
+checksum=1bbd76fd5c9ed647b3a0a03ff9a491073efc1a684043e9d0d5403cbcbdab885b
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes
diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index f81e15760a7c..72f96715a11f 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210809
+version=20210621
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=56696ca84ea69354d9f4cf0a048bf0ee156cea0b97302adb0e35f20e95d1ea99
+checksum=2b94b0d92dc7aa43a20dc4ebf2460c7b303ee5fbaffbab9d9ed296ce99774219
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..78b0f41d3cbe 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.5.1
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz"
-checksum=4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
+checksum=d31be268dda21cf31418f68c78b8e0cbbd90cd8a283c4dfe0c134a7960936fce
diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index 7de5c6902149..86c06124e7b6 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cf107c6f94c97363356b18938f537ee1059ff0909557ba7d847dcf5aac19c145
+checksum=5490b90f39a7bd098380969ee89b3b3dc8f3c2f8b1ecb722a381e8bda960011a
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 5e101a4a4e4f..1b36efc1f38a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcdf1aafde0748e81b82410fbc4ddb01f15f7a57ec17ef17e05d80e8339db0dc
+checksum=a51ec2a3f51a27885f707aa087a7165a2aef3ac284353eafeaaeccef6211e4ba
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..8f2a9952d847 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,13 +1,13 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=1
+version=2.11.4
+revision=2
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-17.5"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"
@@ -20,7 +20,7 @@ homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template
index ba9b550b2fc5..f8010c4b1591 100644
--- a/srcpkgs/papi/template
+++ b/srcpkgs/papi/template
@@ -6,7 +6,7 @@ wrksrc="papi-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 short_desc="Provides interface for use of performance counter hardware"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://icl.cs.utk.edu/papi/"
 distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz"
diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index fb3c0b000924..e02791536387 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20210802
+version=20210701
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=fc5f230c626ecbfad73d391360e9db16191621327c92573125b35f7c62f16aa5
+checksum=1cb7bc70ba63adda3721b546f213cec6ffbad55ed0f725d0975bba34735d8b62
 
 do_install() {
 	vmkdir usr/share/icons
diff --git a/srcpkgs/pari/patches/makefile.patch b/srcpkgs/pari/patches/makefile.patch
deleted file mode 100644
index ec1db15a78c4..000000000000
--- a/srcpkgs/pari/patches/makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add targets to main makefile:
- - gp-dyn
- - gp-sta
- - lib-dyn
- - lib-sta
- - install-lib-dyn
- - install-bin-dyn
-
-Also: define a .NOTPARALLEL target so that top targets are not run in parallel.
-
-Otherwise, running several targets with -j is broken.
-
-Examples:
-
-1. "make -j8 gp lib-sta lib-dyn" fails once in a while
-
-2. "make -j8 doc docpdf" fails every time
-
-With .NOTPARALLEL, both seem to work reliably.
-
-Reference:
-https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#Special-Targets
-
---- pari-2.13.2.orig/config/TOP_Make.SH	2020-10-26 09:43:04.000000000 -0300
-+++ pari-2.13.2/config/TOP_Make.SH	2021-08-14 15:28:04.052670019 -0300
-@@ -42,7 +42,9 @@
- 	@\$(MAKE) gp
- 	@-cd doc && \$(MAKE) doc
-+
-+.NOTPARALLEL:
- 
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp gp-dyn gp-sta lib-dyn lib-sta bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-dyn install-lib-sta install-bin-dyn install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- 	cd \$\$dir && \$(MAKE) \$@
diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 4f2a2cbef9b7..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,29 +1,24 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.2
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
 configure_script=./Configure
-configure_args="--prefix=/usr $(vopt_if pthreads --mt=pthread) -s"
-make_build_target="gp lib-sta lib-dyn doc"
-make_check_target=statest-all
-make_install_target="install install-lib-sta install-lib-dyn"
+configure_args="--prefix=/usr"
+make_build_target=all
+make_check_target=test-all
 hostmakedepends="perl texlive"
 makedepends="gmp-devel readline-devel $(vopt_if x11 libX11-devel)"
 short_desc="Fast computations library in number theory"
-maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=1679985094a0b723d14f49aa891dbe5ec967aa4040050a2c50bd764ddb3eba24
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
-build_options="x11 pthreads"
-build_options_default="x11 pthreads"
-desc_option_pthreads="Enable support for pthreads"
-
-# reduce speed losses due to pthreads
-CFLAGS="-flto -fno-semantic-interposition"
+build_options="x11"
+build_options_default="x11"
 
 post_patch() {
 	# sse2 is not available on all i686
@@ -55,7 +50,6 @@ pari-devel_package() {
 	depends="pari>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch
index 8ee9c968b7d1..095f4ee8aa44 100644
--- a/srcpkgs/pcsclite/patches/python3.patch
+++ b/srcpkgs/pcsclite/patches/python3.patch
@@ -1,6 +1,12 @@
---- a/src/spy/pcsc-spy
-+++ b/src/spy/pcsc-spy
-@@ -21,12 +21,7 @@
+--- a/src/spy/pcsc-spy	2019-12-26 20:48:20.222069705 +0700
++++ b/src/spy/pcsc-spy	2019-12-26 20:48:41.407288561 +0700
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ #    Display PC/SC functions arguments
+@@ -22,12 +22,7 @@
  import os
  import signal
  import time
diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 13cb8c3581f4..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.3
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -10,10 +10,10 @@ makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="BSD-2-Clause, GPL-3.0-or-later"
+license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=ca24fa3cfbc79bdc93e93a919ce04362316deeb21f21b1e8105ff86f85d952bd
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..e39dce1cabb5 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=1
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 74fb80e05bec..5be4f7e271e4 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=2
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="perl-HTML-Parser"
+depends="$hostmakedepends"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 7a0ac1b625f2..da0f12a2e0ee 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.072
+version=2.071
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b5bee81db3905a9069340a450a48e1e1b32dec4ede0064f5703bafb9a707b89d
+checksum=40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a
diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index d7e1de548189..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.041
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=cfa47682471ed4e0c56be92aac2864ef26e6c521723c34e29706d875b6e58537
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a
diff --git a/srcpkgs/perl-Test-Needs/template b/srcpkgs/perl-Test-Needs/template
index 290fe6eec91e..7c9efeb266ed 100644
--- a/srcpkgs/perl-Test-Needs/template
+++ b/srcpkgs/perl-Test-Needs/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Needs'
 pkgname=perl-Test-Needs
-version=0.002009
-revision=1
+version=0.002006
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Needs"
 distfiles="${CPAN_SITE}/Test/Test-Needs-${version}.tar.gz"
-checksum=571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3
+checksum=77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 8b6024657d6a..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.09
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${hostmakedepends}"
-checkdepends="perl-Test-Needs perl-Business-ISBN"
+checkdepends="perl-Test-Needs"
 short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea
diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 81ba180885c2..c7ae7418c417 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.04
+version=2.03
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=ed51bd38c01f53d023f6edf0fab9cd615971fd3ad3bd6c03a1546ebd82d66171
+checksum=3f1dd74df61d61522c0270f196ecc6e80c408f8c4d1835b99e1fce0a0d93845e
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..6d9d813b427b 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=6
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index a1390b7e1ec2..bad7523396ac 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=5
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
new file mode 100644
index 000000000000..2e82aaae330c
--- /dev/null
+++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2018-03-08 07:22:25.000000000 +0100
++++ b/configure.ac	2020-02-11 04:14:37.777681920 +0100
+@@ -1428,7 +1428,7 @@
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm >= 0.5.0], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
new file mode 100644
index 000000000000..fd11e320c209
--- /dev/null
+++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch
@@ -0,0 +1,19 @@
+--- a/libpurple/network.c	2018-03-06 07:00:49.000000000 +0100
++++ b/libpurple/network.c	2020-02-11 04:30:20.163644344 +0100
+@@ -939,8 +939,16 @@
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(0,8,992)
++			if (prev != NM_STATE_CONNECTED_LOCAL &&
++				prev != NM_STATE_CONNECTED_SITE &&
++				prev != NM_STATE_CONNECTED_GLOBAL &&
++				prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index b9dc82b75dee..a2668cf685eb 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.6
-revision=1
+version=2.13.0
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,16 +15,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336
-python_version=2
+checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f
+python_version=2 #unverified
 lib32disabled=yes
 
 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel"
-makedepends="evolution-data-server-devel libglib-devel gtk+-devel libXext-devel
+makedepends="libglib-devel gtk+-devel libXext-devel
  libXScrnSaver-devel gtkspell-devel startup-notification-devel ncurses-devel
  libxml2-devel gst-plugins-base1-devel libidn-devel python-devel
  avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
- libsasl-devel libSM-devel farstream-devel libgnt-devel"
+ libsasl-devel libSM-devel farstream-devel"
 depends="cyrus-sasl-modules gst-plugins-good1"
 
 CFLAGS="-Wno-deprecated-declarations"
@@ -55,7 +55,23 @@ libpurple-devel_package() {
 		vmove usr/share/aclocal/purple.m4
 	}
 }
-
+libgnt_package() {
+	short_desc="IM library extracted from Pidgin (GNT)"
+	pkg_install() {
+		vmove "usr/lib/libgnt*.so*"
+		vmove usr/lib/finch
+		vmove usr/lib/gnt
+	}
+}
+libgnt-devel_package() {
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
+	pkg_install() {
+		vmove usr/include/gnt
+		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
+	}
+}
 finch_package() {
 	short_desc="Ncurses-based messaging client"
 	pkg_install() {
diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index c7babbe84d8b..d93880ef3aee 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=565f44d9ade051e0a0cd093abb2f9808a6b4d1d770187aed88ba95f755a3ac7d
+checksum=c6387a40bbc8f8c8ddb3a9b3b0587ae103477ae318d9b5380f0e7d0c2b2dad9f
diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 0333eb6d6f43..15abe63db703 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=9b02dad1b91175d7f469a50143aa6dc7785102ec7accdb98bfef2512b673ce89
+checksum=a298c36bad00e4166bdb6eacf5a6cee82dfa37eebcec08f1e34ca1d82cddddbc
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch
index 426ebde5d844..dd2a57fa3b42 100644
--- a/srcpkgs/pioneer/patches/ppc.patch
+++ b/srcpkgs/pioneer/patches/ppc.patch
@@ -1,10 +1,10 @@
 --- a/contrib/profiler/Profiler.h
 +++ b/contrib/profiler/Profiler.h
-@@ -8,7 +8,7 @@
- #define __PROFILER_FULL_TYPE_EXPANSION__
+@@ -11,7 +11,7 @@
+ #undef fastcall
  
  //#define USE_CHRONO
--#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__PPC64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
+-#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
 +#if !defined(USE_CHRONO) && (defined(__arm__) || defined(__aarch64__) || defined(__powerpc__) || defined(_M_AMD64) || defined(_WIN64) || defined(_M_X64))
  // this isn't optional for __arm__ or x64 builds
  #define USE_CHRONO
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20210203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"
diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 421b96fe8269..bb1afcf4501a 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,19 +1,15 @@
 # Template file for 'piper'
 pkgname=piper
-version=0.6
-revision=1
+version=0.5.1
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev"
 makedepends="python3-devel python3-gobject-devel"
 depends="libratbag gtk+3 python3-lxml"
-checkdepends="flake8"
+checkdepends="python3-flake8"
 short_desc="GTK application to configure gaming mice"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/libratbag/piper"
 distfiles="https://github.com/libratbag/piper/archive/${version}.tar.gz"
-checksum=aa2fb9b63cd926067bdf2842013169e279fe2a159e8575f392fc1f042cdec001
-
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-Dtests=false"
-fi
+checksum=6a5f4ecfd8f9883a2db9c9692adbf2a3c43d3a6485929428ee9bfe2d421d3cce
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 2e7da142b0c2..b61c6a74e63e 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,13 +1,13 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.32
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
- -Dbluez5=enabled -Dffmpeg=disabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
+ -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d -Db_ndebug=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
  libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel libusb-devel fdk-aac-devel
  libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision}
@@ -97,6 +97,13 @@ libspa-control_package() {
 	}
 }
 
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa-0.2/ffmpeg
+	}
+}
+
 libspa-jack_package() {
 	short_desc+=" - jack plugins"
 	pkg_install() {
diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index a18b089b1431..d772476fbd32 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -1,7 +1,7 @@
 # Template file for 'plantuml'
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
-version=1.2021.9
+version=1.2021.7
 revision=1
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
@@ -11,7 +11,7 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="GPL-2.0-or-later"
 homepage="http://plantuml.com/"
 distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
-checksum=082b4cd108668f1f45c698b44900b744907abe36674dd86f2d3075ab88984c74
+checksum=0dd85bb63d385c8494d4a09d1f11396e8cc23fbe65810d953c199b792bdd6104
 
 do_build() {
 	. /etc/profile.d/10_openjdk8.sh
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 89163820425e..b482e38a0c71 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b22ec790f9a5ab1afad4ba1828fdaa57729d33e838c0e215d12a877ce5d7808
+checksum=baf3839e5f40395761e515e1837ba5bc685bf62b794767a821e9a9db99ffb79a
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index cb1f29dc714d..e0f2a9eb0bd8 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=728e9f8ec670f4f0370c9cc86ede317c682f95f3655bddcf8bb06a38192d4230
+checksum=bd5b838572517859e7fda51f39ed599799e3b758b3edddc3865dd6b63a37d610
 replaces="user-manager>=0"
 python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 2070048c11e1..1b099314dd10 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=57f915c51e07741d7084fe729a337da4a465a58deefbefd297d0e1a9cca87909
+checksum=14106642d667a6b10e02587279ffd937a2e74b4fec89156d95831c31daab66a8
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index d86aa3f5e567..4a976e299038 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=21dd972abbca56ae7760acbe39b50d5e39d2057e987a8dcdd2a4c142dafd35b0
+checksum=0d44b4acef8dd88b9be131b215b7a385b71884022f94b9c61c293c8357056024
diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 34fa0f29be3e..27ed2a7eee29 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=879b3a97ec1a43a7108a2469e5d23578f05b1afcd838b286576ca5a14fadf8ff
+checksum=19b5cc632a2e79c28caeea36fdf9e1cc47c1ee1d7c1dc3432378854ac0aa1532
 
 do_check() {
 	cd build
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 63144055607a..6d6ba8a6771b 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e08b0c8030ef465d44de4f460d71970f15c7697c7d3095afa9d07b2d41a45467
+checksum=18f254cd1de0f7f21aae364f93bdef5e195f3595eb616bd63fe10efb41e0ba0b
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index a039cddfd026..f09a1d9842d6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c8043d33023aae1087a8d35800575ee9df710f35ec996fb9fc7ecc8f35576eb3
+checksum=3d66e0fd5e8747890c9e3dabde790b962686b3f88be305aec42d0aa38a24b8c6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 4617693b8cdb..d3f6d65fb009 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8a5b5b212c0f08e2c5e9f0ee7f5d62b0adf6008b69d337cede3ca18b800700dc
+checksum=0ad82a275abfb7fe2519e5d3591064db4e62c725a24089a7a21e15eb70428aa0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index af714465c0b8..9293ebff9373 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0e5accaaf28de37240c95597d432d2ca941ee5f379eb0553c9bc08e7d61f305b
+checksum=d26ad80dcb1ec504327339ccdb550600589461bafe9517b050538ac54b8dc742
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 0d7c9db2b951..3c6eed9d92d3 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b0d43e91d8ba368fed96d63b34aee7f401a9c0cc47533b363bca365a69c86be
+checksum=c9984f0e88a39590ca464e3f3806a3be03c52217a2d045fa72b200b25991e4d3
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index ad765127a0b0..e377165f57f4 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e974f54db5fe13731aa8c68976e8eb59ec0ba53ce0d4e1633fd3c152d586b1b0
+checksum=3fdf30c05bb383e8b5096e2d1c30ced07df9580549bd95d3dbff31f589b3bbb8
 
 do_check() {
 	: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index af2b590df791..b1c90df102bb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6938ca9a0a17cbd4a903b967b7c06be765d22bae3e8bcebf35a367a415a2cbdc
+checksum=d31adbc94dd0a313c48486611ac25c0796506a4e6273b874936e99af575d6d8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 527ffb7856d8..3c9d3370994b 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9da4dfea96c4aa1a7a9683f887573433777354691850ada62ed54c4221e7f29
+checksum=e3e2ee7bc6cf46c8976644c15a7fc5bb96354c07840fca8a2da3fc9ddd375e75
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 9157efd47628..0c7495ad3dbd 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,11 +1,11 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
- -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DKF5_HOST_TOOLING=/usr/lib/cmake"
+ -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner 
+ DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
  qt5-wayland plasma-wayland-protocols gettext wayland-devel
  kcmutils kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
@@ -23,7 +23,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af16b7151d87151a197b8fba41092f14895c0e64bfab05f562f831e18c6120ba
+checksum=d95c0a1557a112aabcf502656b7554e88130dfcae0515c0014669304faa5a4d6
 
 build_options="pipewire"
 build_options_default="pipewire"
diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
new file mode 100644
index 000000000000..d9090de158e7
--- /dev/null
+++ b/srcpkgs/podman/INSTALL.msg
@@ -0,0 +1,15 @@
+`fuse-overlayfs` has been added as a runtime dependency to podman.
+podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
+
+To switch to the new storage driver, podman has to be reset:
+
+    # podman system reset
+
+To instead keep using the `vfs` driver, add
+
+    [storage]
+    driver="vfs"
+
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 6db65f96cffa..5808c7122ae7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.2.3
+version=3.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,9 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=ddb8a83d21d2f496512914820525b4c959ff0902d48caaf93a005854a9069b59
+checksum=70f70327be96d873c83c741c004806c0014ea41039e716545c789b4393184e79
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 5a3c062a57d9..f2f05fd3b30c 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.4.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 20411de08e7d..1345b747a3a6 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.22.4
+version=5.22.3
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=e2836b462261351cd920a61473c5812a9d2770db20a1cbd22dca248d89cdb95f
+checksum=9c49d885df54a8edf931b859f677c5126b82cf4436d17d64d831d5151fce4d9a
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 905fca01a26f..f4ec111d3f9d 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.21
+version=3.0.20
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://wiki.gentoo.org/wiki/Portage"
 distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=bf1d3d73322dcaa9b9aaf01077dd60ff2ee740c8559fef0b6058bf4b91f076cf
+checksum=f828cec745b616924a64e5f7aae155edf4696dd8806e92aa637cb30c3dd7205e
 
 conf_files="
 	/etc/dispatch-conf.conf
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 15189e218237..80d321fb726c 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.2
-revision=2
+version=3.6.1
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4
+checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"
diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index bb5effa3e01d..abefe9159680 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql12-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql12-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index 24df39ae050f..21e894f61e98 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.3
+version=3.1.2
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -13,21 +13,19 @@ hostmakedepends="automake libtool perl pkg-config geos
  libgdal-tools postgresql-libs-devel which"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 69cc6f504e51..e73a8e6d351a 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.3
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -12,21 +12,19 @@ hostmakedepends="automake libtool perl which pkg-config geos libgdal-tools
  postgresql9.6-libs-devel"
 makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql9.6-libs-devel
  proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
+checkdepends="libxslt"
 short_desc="Spatial database extender for PostgreSQL"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb
+checksum=2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732
 nocross="FIXME: Cannot run test program to determine PROJ version"
+# unit tests require unpackaged cunit
+# regression tests require running postgresql
+make_check=no
 
 pre_configure() {
 	./autogen.sh
 }
-
-pre_check() {
-	# regression tests require running postgresql
-	vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index b8f2ad8f964d..108fd8a1e5b4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.23
-revision=1
+version=9.6.22
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -13,12 +13,12 @@ hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
+checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
 # initdb fails on github actions, works locally with xbps-uunshare
 make_check=ci-skip
 
diff --git a/srcpkgs/postgresql/update b/srcpkgs/postgresql/update
index ba2bccadc5de..01921d026193 100644
--- a/srcpkgs/postgresql/update
+++ b/srcpkgs/postgresql/update
@@ -1,2 +1,2 @@
 site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K9[\d.]+(?!\w)"
+pattern="v\K[\d.]+(?!\w)"
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index b11aaa840f04..288837212561 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
-version=12.8
-revision=1
+version=12.7
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
+checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 9c6a33935ba3..f298809db626 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
-version=13.4
-revision=1
+version=13.3
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -21,7 +21,7 @@ license="PostgreSQL"
 homepage="https://www.postgresql.org"
 changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
+checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1
 
 conf_files="
  /${_prefix}/etc/default/postgresql
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index a3b7ffbe5279..b15853ea561a 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d5d01e5017306aff215e6ba3be21c940b7771a599e92445f8526406fb63e829c
+checksum=64ed0741308c4e488e9fc049bde5a7c391ef7e8c12cdb055456f9c3b3deaffc4
diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index b2b64531cd16..36d4d6b42400 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -1,15 +1,15 @@
 # Template file for 'pp'
 pkgname=pp
-version=1.0.9
+version=1.0.8
 revision=1
 wrksrc="${pkgname}"
 build_style=gnu-makefile
 short_desc="Simple preprocessor"
-maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+maintainer="Paper <paper@tilde.institute>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=c4044ba8c2e47d8b2ef9fd467c46ae6316fdae8a6de5faaa800b566458e1f5e4
+checksum=2115b8e7d84f86864c979ea3c04288dd7f427fa758372cfef28a04badfade3b8
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index bca8024269a1..36998655dc1c 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=5694331eede92a4d6c601c83b61b56266ded86453d1abd794fdad84131c1cdb0
+checksum=f27a51658a0fa3f761cb231542c92931f34e5a7030f7d8792b12a18b1d206d9d
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 33502549bd51..7d0ac6a3946d 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.10
+version=0.11.9
 revision=1
 build_style=configure
 configure_args="
@@ -26,9 +26,8 @@ short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
-changelog="https://blog.prosody.im/prosody-${version}-released/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=c6d714e6d4a6ddd1db1266b205d9d8a3ed91818f42755c9268ffb18359d204e1
+checksum=ccc032aea49d858635fb93644db276de6812be83073a8d80e9b4508095deff09
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index b95d67533565..6409fe71dc89 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,6 +1,6 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.0
+version=1.5.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -9,13 +9,6 @@ short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
-changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c25b51f6d353f6672edd3417ad2dd2c04d6cd9f6ed8876a5874f313bbfd180ae
+checksum=5b1be5e3b40f7b6e64fa593f9fd1264ca37a99ab04d83907e14e9ba8da3e69d2
 make_check=no # no tests in pypi tarball
-
-post_install() {
-	# Remove `protontricks-desktop-install`, since we
-	# already install .desktop files properly.
-	rm ${DESTDIR}/usr/bin/protontricks-desktop-install
-}
diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index 940585a857d5..04425cc36211 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,17 +1,15 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
-version=2.2.11
-revision=2
-wrksrc="linux-cli-community-${version}"
+version=2.2.6
+revision=1
+wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="openvpn python3-pythondialog python3-docopt python3-requests
- python3-Jinja2 python3-distro"
+depends="openvpn python3-pythondialog python3-docopt python3-requests python3-Jinja2"
 short_desc="Linux command-line client for ProtonVPN written in Python"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/ProtonVPN/linux-cli"
-distfiles="https://github.com/ProtonVPN/linux-cli-community/archive/refs/tags/v${version}.tar.gz"
-checksum=2fc643762e9156928b706c31a7826427a7ca12c7ae4cdfb656746cd2de3af66b
-make_check=no # Package Defines No Checks
+distfiles="https://github.com/ProtonVPN/linux-cli/archive/v${version}.tar.gz"
+checksum=01ff05c9e6c174c7879553310d15bd0bcaf31e62be8c7f9a8c01b434a7c2612e
diff --git a/srcpkgs/psiconv-devel b/srcpkgs/psiconv-devel
new file mode 120000
index 000000000000..1e97358ed578
--- /dev/null
+++ b/srcpkgs/psiconv-devel
@@ -0,0 +1 @@
+psiconv
\ No newline at end of file
diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
new file mode 100644
index 000000000000..1e574d489dc3
--- /dev/null
+++ b/srcpkgs/psiconv/template
@@ -0,0 +1,28 @@
+# Template file for 'psiconv'
+pkgname=psiconv
+version=0.9.9
+revision=9
+build_style=gnu-configure
+configure_args="--disable-xhtml-docs"
+hostmakedepends="pkg-config libmagick6-devel"
+makedepends="libmagick6-devel"
+conf_files="/etc/psiconv/*"
+short_desc="Conversion utility for EPOC32 (Psion) files"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="http://frodo.looijaard.name/project/psiconv"
+distfiles="http://www.frodo.looijaard.name/system/files/software/psiconv/psiconv-${version}.tar.gz"
+checksum=6d51fe79b502a1e277bea275a574ae2db5b1b9d7daef703a8fa3635ae02a8bb0
+
+CFLAGS="-fcommon"
+
+psiconv-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/psiconv-config
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch
new file mode 100644
index 000000000000..23aac81eef88
--- /dev/null
+++ b/srcpkgs/ptii/patches/fix-installpaths.patch
@@ -0,0 +1,15 @@
+Adjust install paths and add LICENSE to installed files.
+
+--- a/Makefile	2014-02-10 10:36:26.000000000 +0100
++++ b/Makefile	2015-10-23 20:24:01.308136083 +0200
+@@ -26,7 +26,8 @@
+ 
+ install: all
+ 	install -D -m755 ptii $(DESTDIR)$(PREFIX)/bin/ptii
+-	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/README
++	install -D -m644 README $(DESTDIR)$(PREFIX)/share/doc/ptii/README
++	install -D -m644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/ptii/LICENSE
+ 
+ uninstall:
+-	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/README}
++	rm $(DESTDIR)$(PREFIX)/{bin/ptii,/share/doc/ptii/README,/share/licenses/ptii/LICENSE}
diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template
new file mode 100644
index 000000000000..572d59daad4d
--- /dev/null
+++ b/srcpkgs/ptii/template
@@ -0,0 +1,14 @@
+# Template file for 'ptii'
+pkgname=ptii
+version=0.4
+revision=2
+build_style=gnu-makefile
+makedepends="inotify-tools-devel"
+short_desc="Simple program you can use with ii"
+maintainer="Diogo Leal <diogo@diogoleal.com>"
+license="WTFPL"
+homepage="http://git.z3bra.org/cgit.cgi/ptii/"
+distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2"
+checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26
+
+LDFLAGS="-lpthread"
diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index eb38341cd570..0720da479e03 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5817a400aa531a3e5f5fbdadc4b350cbdc6286f2983a341db0d3b1cd03b248f
+checksum=67bb7d2a31ede9ab059b50a9f3ed7b53050060662b0bde29a08f30c25c413007
 
 do_check() {
 	cd build
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index cf385472c433..e4efe58debd4 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -1,6 +1,6 @@
 # Template file for 'putty'
 pkgname=putty
-version=0.76
+version=0.75
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,9 +9,8 @@ short_desc="Free Telnet/SSH Client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-changelog="https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html"
 distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
-checksum=547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f
+checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5
 
 CFLAGS="-Wno-error"
 
diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7a1c38fda94e..eac8cc48a1e6 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.38
+version=3.37
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16799f643362259447d01bdbdfc48e3022227180ccbb88585aaa08191b7d1fee
+checksum=b260b752ff2953538ad3f0202af2dd0bd469c6ebc88d5045cf74890876d24f47
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/pylint/patches/fix-tests.patch b/srcpkgs/pylint/patches/fix-tests.patch
deleted file mode 100644
index 9eda4571cc33..000000000000
--- a/srcpkgs/pylint/patches/fix-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/PyCQA/pylint/pull/4781
-
---- a/tests/lint/unittest_lint.py
-+++ b/tests/lint/unittest_lint.py
-@@ -643,7 +643,7 @@ def test_pylint_home():
-             assert config.PYLINT_HOME == pylintd
-         finally:
-             try:
--                os.remove(pylintd)
-+                rmtree(pylintd)
-             except FileNotFoundError:
-                 pass
-     finally:
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 7b1b6e4fed21..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,26 +1,34 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.9.6
+version=2.7.4
 revision=1
+wrksrc="pylint-${version}"
 build_style=python3-module
-make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml"
-checkdepends="$depends python3-pytest python3-tkinter python3-six"
+depends="python3-astroid python3-six python3-isort python3-mccabe python3-toml"
+checkdepends="python3-astroid python3-isort python3-mccabe python3-pytest python3-toml"
 short_desc="Python code static checker"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pylint.org/"
+homepage="http://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
-distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=e6335c810ee3ff4b59e3990db49cf0d1e263e122b766853755436d88133c9496
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
 	# install example config and emacs files
 	vsconf examples/pylintrc
 	vsconf examples/pylintrc_camelcase
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
+
+	for f in man/*; do
+		vman "$f"
+	done
 }
 
 python3-pylint_package() {
diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch
new file mode 100644
index 000000000000..9521dab29d9b
--- /dev/null
+++ b/srcpkgs/python-docutils/patches/test-import.patch
@@ -0,0 +1,20 @@
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -51,14 +51,9 @@
+ 
+ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir)
+ os.chdir(testroot)
+-if sys.version_info >= (3, 0):
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot,
+-                                                     '..', 'build', 'lib')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..',
+-                                                  'build', 'lib', 'extras')))
+-else:
+-    sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..')))
+-    sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras')))
++builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor)
++sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib')))
++sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras')))
+ sys.path.insert(0, testroot)
+ 
+ try:
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
new file mode 100644
index 000000000000..02232f31a266
--- /dev/null
+++ b/srcpkgs/python-docutils/template
@@ -0,0 +1,62 @@
+# Template file for 'python-docutils'
+pkgname=python-docutils
+version=0.16
+revision=3
+wrksrc="docutils-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+# docutils/writers/odf_odt/pygmentsformatter.py
+depends="python python-Pygments"
+short_desc="Python2 documentation utilities"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
+homepage="http://docutils.sourceforge.net"
+distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
+checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
+checkdepends+="$depends python3-Pygments"
+
+alternatives="
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2html4:/usr/bin/rst2html4.py2
+ docutils:rst2html5:/usr/bin/rst2html5.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
+
+do_check() {
+	cd test
+	python3 alltests.py
+}
+
+post_install() {
+	vlicense COPYING.txt COPYING
+}
+
+python3-docutils_package() {
+	alternatives="
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2html4:/usr/bin/rst2html4.py3
+	 docutils:rst2html5:/usr/bin/rst2html5.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
+	depends="python3 python3-Pygments"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove "usr/bin/*3"
+		vmove "usr/lib/python3*"
+		vlicense COPYING.txt COPYING
+	}
+}
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 4f8cd0f5889a..263b9954756d 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.7.4
-revision=2
+revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index ee3eb96ffd5b..e3a8b722d3d7 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.10.0
+version=2.9.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6
+checksum=a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {
diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template
deleted file mode 100644
index 204eba16181f..000000000000
--- a/srcpkgs/python3-RPi.GPIO/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-RPi.GPIO'
-pkgname=python3-RPi.GPIO
-version=0.7.0
-revision=1
-archs="armv[67]l* aarch64*"
-wrksrc="${pkgname#*-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
-depends="python3"
-short_desc="Module to control Raspberry Pi GPIO channels"
-maintainer="amak <amak.git@outlook.com>"
-license="MIT"
-homepage="https://sourceforge.net/projects/raspberry-gpio-python"
-distfiles="${SOURCEFORGE_SITE}/project/raspberry-gpio-python/RPi.GPIO-${version}.tar.gz"
-checksum=7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f
-
-# needed for gcc 10
-# fixed upstream in commit 8a0a65
-CFLAGS="-fcommon"
-
-post_install() {
-	vlicense LICENCE.txt
-}
diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index ff8b0aa36fb4..90337771ace5 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,19 +1,17 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
-version=2.0.0
-revision=1
-wrksrc="aioredis-py-${version}"
+version=1.3.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-async-timeout python3-typing_extensions python3-hiredis"
+depends="python3-async-timeout python3-hiredis"
 short_desc="Asynchronous Redis client for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/aio-libs/aioredis"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=16c351d24029deb991cf56ea9dfd8faccaeac60080149d57b5983a93145ad7cc
-# checks require a locally running redis server
-make_check="no"
+checksum=f8feabb973e446bb1315b203469e48014e0bd15c79bb4c87036092ee2037da06
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index bec1109131d8..6609672c134d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,8 +11,8 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=ae57a67583e5ff8b4af47666ff5651c3732d45fd26c929253748e796af860374
-# Tests not supported
+checksum=41c4be842c284222b197a625d76a7ab85adf9d52788f563172fe180c2744b6c1
+# Tests require unpackaged "trustme"
 make_check=no
 
 post_install() {
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4c9f405e5f9e..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,16 +1,18 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.6.5
+version=2.5.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lazy-object-proxy python3-wrapt"
-checkdepends="$depends python3-pytest python3-numpy"
+depends="python3-six python3-lazy-object-proxy python3-wrapt
+ python3-typed-ast"
+checkdepends="$depends python3-attrs python3-pytest python3-wcwidth
+ python3-py python3-pluggy python3-more-itertools python3-parsing"
 short_desc="Abstract syntax tree for Python3"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
 changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
-distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4e22e703abc1220e6ec4a41740f5d8a51a5484a1b24d61cd4495f995ef2296a7
+distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91
diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index efd5af32614a..622d6e3f1b1c 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.18.21
+version=1.17.104
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=bbcf1cab76c65296394310264cf141992d3493519d402f1b3d95894f85c08dab
+checksum=6d95784d86134df8bf55df8993c10f213cdd268d344622fd17e7a145dfcd7575
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 179d770bbff5..e060dd652118 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
-version=2.2.0
-revision=1
+version=2.1.3
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest"
 short_desc="Fast ISO8601 date time parser for Python, written in C"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/closeio/ciso8601"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f33c4ba69d8b5897854e4db261b7f140404f9749e79247d3447918a061ab49f4
+checksum=4f27113e10622a3b86161c90bee80dc6f3ab8dcab9385092088db239e9fd94dc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 1c73d2e4d95b..077fda2b81e1 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,16 +1,15 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=1
+version=1.5.0
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3"
-checkdepends="python3-unittest-mixins python3-pytest"
 short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 000000000000..8876054b3b55
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file
diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
deleted file mode 100644
index 6ffd111a0a12..000000000000
--- a/srcpkgs/python3-docutils/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python3-docutils'
-pkgname=python3-docutils
-version=0.17.1
-revision=1
-wrksrc="docutils-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-# docutils/writers/odf_odt/pygmentsformatter.py
-depends="python3-Pygments"
-checkdepends="${depends}"
-short_desc="Python3 documentation utilities"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
-homepage="http://docutils.sourceforge.net"
-distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
-
-alternatives="
- docutils:rst2html:/usr/bin/rst2html.py
- docutils:rst2html4:/usr/bin/rst2html4.py
- docutils:rst2html5:/usr/bin/rst2html5.py
- docutils:rst2latex:/usr/bin/rst2latex.py
- docutils:rst2man:/usr/bin/rst2man.py
- docutils:rst2odt:/usr/bin/rst2odt.py
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py
- docutils:rst2s5:/usr/bin/rst2s5.py
- docutils:rst2xetex:/usr/bin/rst2xetex.py
- docutils:rst2xml:/usr/bin/rst2xml.py
- docutils:rstpep2html:/usr/bin/rstpep2html.py"
-
-do_check() {
-	cd test
-	python3 alltests.py
-}
-
-post_install() {
-	vlicense COPYING.txt COPYING
-}
diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index 1584394b2203..4de38628f65d 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
-version=2.2.3
+version=2.2.2
 revision=1
 wrksrc=elementpath-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/sissaschool/elementpath"
 distfiles="${PYPI_SITE}/e/elementpath/elementpath-${version}.tar.gz"
-checksum=60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6
+checksum=68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157
 
 post_patch() {
 	# depends on xmlschema and memory_profiling
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index e13d6285244a..e2f665255b93 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.3.0
+version=3.2.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=65fbe22aaa7f880b776b20814bd80b0afbf91d1f95b17235b608aa256325ce57
+checksum=592464c9268bbacec9bc67b5a3ae62e6e090aeec1563e69501df338a1728e551
 
 post_install() {
 	vlicense ../LICENSE
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index b749c3f698d6..8c7ca89135aa 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.26.0
+version=7.25.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=0cff04bb042800129348701f7bd68a430a844e8fb193979c08f6c99f28bb735e
+checksum=54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {
diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template
index ccf9ed82f29a..93e359df6d13 100644
--- a/srcpkgs/python3-json5/template
+++ b/srcpkgs/python3-json5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-json5'
 pkgname=python3-json5
-version=0.9.6
+version=0.9.5
 revision=1
 wrksrc=pyjson5-${version}
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/dpranke/pyjson5"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eeb5e7d77b095dbfeae2e00c7df80ac8064994b33c5c36982f504c5c17c77a8c
+checksum=4631b8a6c61704b7942fe9d16a1e95f2b26a2bdcc38a1fdc3b5c984f2e861045
diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 563bb01d2e57..e522350de61f 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.10.1
+version=1.8.0
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=fe6b589bd8d8fe08f608e90ce7da1e6bbfd020d99897453b45149a7853e9188f
+checksum=8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237
 # Tarball defines no tests
 make_check=no
 
diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index 469924e5f875..b02f650fb8db 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.6.1
+version=2.6.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="https://github.com/jupyterlab/jupyterlab_server/archive/refs/tags/v${version}.tar.gz"
-checksum=d10ecc867065820079f926d59239a7294a525693832bc6276bdd0f432946bc76
+checksum=244d540075f132bebe054484235a0aee8a18696dedfb11cb4fd9c1bec7f6aeb1
 # Tests require unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index e001f16e7748..a921ee641a95 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.1
+version=3.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=bef034fbc403feacc4d28e71520eff6a1fcc4a677f0bec5324f68ea084c8c103
+checksum=964b3a8048668c7071eaef9d266f9e7853f970542d1ace011fa53e032b225405
diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 4a354ae02cca..dd5492a8dd5c 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.4.3
+version=3.4.2
 revision=1
 wrksrc="matplotlib-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom:matplotlib, BSD-3-Clause, MIT"
 homepage="https://matplotlib.org/"
 distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz"
-checksum=474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c
+checksum=e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 0333827d3db9..4729c0e8e2d7 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.21.2
+version=1.21.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=6d05baea03e94dc44580752032f092c04742d3f9e31c8ebd7fe2e339d06373c5
+checksum=29b57d78689dde8772f0eae5a334af273e42f7fb12cb0b464d6827121dbb1c78
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index f5d9a5200dc4..130b54166f75 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.3.2
+version=1.3.1
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=2917bf5d23a584ee6dc0a80fade7e06db22f63786a5ecdf80aedb4387884f312
+checksum=9ed73997724945d3005551a8958820932bed9618e1fe0754143a96ae68a90ee7
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index cffad7a5c60c..9ef65d48341a 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=2.16.1
+version=2.15.0
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=e24dff6af31f1eb732fcb5db4678835d1f312643996fdcd9dbeb8aca52bc0dde
+checksum=a33f3b52840ceae3fd64f0a18da307cda4a55549eb64177fc716547636fc37ae
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index 143e2a05e262..d6d446b21572 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,7 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -67,9 +67,7 @@
-     },
+@@ -70,8 +70,6 @@
      entry_points={
          "console_scripts": [
 -            "pip=pip._internal.cli.main:main",
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index b19e0f830745..d9de3bb50c45 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.2.4
+version=21.2.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
+checksum=303a82aaa24cdc01f7ebbd1afc7d1b871a4aa0a88bb5bedef1fa86a3ee44ca0a
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 2aca6075eca8..f11318738e21 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.4
+version=0.16.3
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=992e78082c0b33c7bc708176ce9e0df9bac9ae3b08bf111c368571bc32e723d6
+checksum=51fa41281383212db3b2a6906713871edc1a7d597ae387873026402e281a0b25
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 2eb834eceae3..c2c7a3539eba 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.4.12
+version=1.4.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=b7d7b7844c98a105065d683190c3d0723b4a1addde5a46f21938ead351ec8a65
+checksum=f685b3a6bd98a40e3e22fe757d1b1ab5a5f0f9c3d29c2141c6fcaa1b30bb2ee0
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8
diff --git a/srcpkgs/python3-pypandoc/patches/no-pip.patch b/srcpkgs/python3-pypandoc/patches/no-pip.patch
deleted file mode 100644
index 85ba6e990544..000000000000
--- a/srcpkgs/python3-pypandoc/patches/no-pip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-===================================================================
---- pypandoc-1.6.3.orig/pypandoc.egg-info/requires.txt
-+++ pypandoc-1.6.3/pypandoc.egg-info/requires.txt
-1@ -1,3 +0,0 @@
--setuptools
--pip>=8.1.0
--wheel>=0.25.0
-Index: pypandoc-1.6.3/setup.py
-===================================================================
---- pypandoc-1.6.3.orig/setup.py
-+++ pypandoc-1.6.3/setup.py
-@@ -87,7 +87,6 @@ setup(
-     author_email = 'bebraw@gmail.com',
-     packages = ['pypandoc'],
-     package_data={'pypandoc': ['files/*']},
--    install_requires = ['setuptools', 'pip>=8.1.0', 'wheel>=0.25.0'],
-     classifiers=[
-         'Development Status :: 4 - Beta',
-         'Environment :: Console',
diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index e131ccfa7da2..de6fea26d07d 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
-version=1.6.3
-revision=1
+version=1.5
+revision=2
 wrksrc=pypandoc-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"
-checkdepends="pandoc texlive"
+checkdepends="$depends python3-pip texlive"
 short_desc="Python thin wrapper for pandoc"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MIT"
 homepage="https://github.com/bebraw/pypandoc"
 distfiles="$PYPI_SITE/p/pypandoc/pypandoc-$version.tar.gz"
-checksum=95a331f5ef74adb9557e9961d784c30ba73bd0d62e7736bb5d9ce74888b9f438
+checksum=14a49977ab1fbc9b14ef3087dcb101f336851837fca55ca79cf33846cc4976ff
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index d5e33af8358f..c278114af2c8 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=1
+version=0.17.3
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,10 +12,10 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e
 
 post_install() {
-	vlicense LICENSE.mit LICENSE
+	vlicense LICENCE.mit LICENSE
 }
 
 python3-rsistent_package() {
diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index f246e35c4115..4046fa5055e1 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -1,8 +1,8 @@
 # Template file for 'python3-pyscard'
 pkgname=python3-pyscard
 _pkgname=pyscard
-version=2.0.1
-revision=1
+version=2.0.0
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://pyscard.sourceforge.io/index.html"
 distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8
+checksum=b364d9d9186e793c1c4709eb72a4d29e09067d36ca463b2c2abd995bd1055779
 # provides="python3-scard-${version}_$revision"
 # replaces="python3-scard>=0"
 
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 4ad868cbbde7..9e992b779564 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,18 +1,22 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
-version=0.10.2
-revision=1
+version=0.10.1
+revision=3
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-pbr python3-six"
+checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
+ python3-cryptography python3-dogpile.cache python3-future python3-jmespath
+ python3-jsonpointer python3-netifaces python3-pyperclip python3-random2
+ python3-requests python3-stevedore python3-voluptuous python3-wcwidth
+ python3-wrapt python3-yaml"
 short_desc="Deal PySol FC Cards"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 distfiles="${PYPI_SITE}/p/pysol_cards/pysol_cards-${version}.tar.gz"
-checksum=2e9f5bfe5b6df3760ca274731e92820423066831df6351bbfdf832e32bbcc76e
-make_check=no # unpackaged hacking, oslotest, stestr
+checksum=ea6ac7e5849d0002cc880868f3a82a84332d5bbb79eb6496ed9676a104046297
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
deleted file mode 100644
index 12afe88ffe07..000000000000
--- a/srcpkgs/python3-pytest-httpserver/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pytest-httpserver'
-pkgname=python3-pytest-httpserver
-version=1.0.1
-revision=1
-wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest python3-Werkzeug"
-short_desc="HTTP server for pytest"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="MIT"
-homepage="https://www.github.com/csernazs/pytest-httpserver"
-changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
-distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=c475d9c3c16fd8e5c49e1028f8ded2159a9afbb5ea7a2f5886cf534fc7c97e99
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index a9ecd429f467..5a194723f83b 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.2.8
+version=2021.2.7
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b
+checksum=0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index 4b4bf8b44a15..03807afcc0ea 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
-version=22.2.1
+version=22.1.0
 revision=1
 wrksrc="pyzmq-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="LGPL-3.0-or-later, BSD-3-Clause"
 homepage="https://pyzmq.readthedocs.io/"
 changelog="https://pyzmq.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pyzmq/pyzmq-${version}.tar.gz"
-checksum=6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242
+checksum=7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d
 
 pre_build() {
 	cat > setup.cfg <<-EOF
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 5df229570956..d4e7636810e9 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2021.8.3
+version=2021.7.6
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
+checksum=8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)
diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 58bda9b40ef1..9ed11b2ad473 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.7.1
+version=1.7.0
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=fdfe1d1eb1569846e331bd8d72106a8c446dafb2192c00adbb5376b02a0a1104
+checksum=0564d1091b8db03418356f0839cc4bf73b9bf7cd1089586eb690208e1f44bb8d
 
 build_options="openblas"
 
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
deleted file mode 100644
index 728196e7100c..000000000000
--- a/srcpkgs/python3-smartypants/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-smartypants'
-pkgname=python3-smartypants
-version=2.0.1
-revision=1
-wrksrc="smartypants.py-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-docutils"
-short_desc="Python with the SmartyPants"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/leohemsted/smartypants.py/"
-distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
-checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 130923b5e4ac..f541afcdfddf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.8.8
+version=2021.7.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=14919d3c58766d214cb78572cbc3db2db0bfaf0c3d26acc6728e8ee95745d6e3
+checksum=394c6dc5ff40c3b8248d4b11be70cf0821d9c5762655d68d04489cd08b97786d
 # Tests require unpackaged fsspec
 make_check=no
 
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
deleted file mode 100644
index f168a9cad689..000000000000
--- a/srcpkgs/python3-typogrify/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-typogrify'
-pkgname=python3-typogrify
-version=2.0.7
-revision=1
-wrksrc="typogrify-$version"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-smartypants"
-short_desc="Filters to enhance web typography"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://github.com/mintchaos/typogrify"
-distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
-checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
-make_check=no # conflicting dependencies
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 28d48a351a5f..9d8af1e8bc05 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=4.1.0
+version=4.0.2
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c
+checksum=c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index da5a2b0c2b3c..a87210ebe16a 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,15 +1,14 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
-version=1.0.3
-revision=1
+version=1.0.2
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-devel python3-urwid"
 depends="python3-urwid"
-checkdepends="$depends python3-mock"
-short_desc="Tree widgets for urwid"
+short_desc="Tree widgets for urwid (Python3)"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pazz/urwidtrees"
 distfiles="https://github.com/pazz/urwidtrees/archive/${version}.tar.gz"
-checksum=6e4178eac8c69237011449e5225a7b7f369b5052a0964a5b6e413fcdc1502b3a
+checksum=703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034
diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 580ba9fc33b6..8d155e15b600 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
-version=1.2.1
-revision=1
+version=1.1.1
+revision=2
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3 libusb"
 short_desc="Python library for USB communication"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/pyusb/pyusb"
 distfiles="${PYPI_SITE}/p/pyusb/pyusb-${version}.tar.gz"
-checksum=a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9
+checksum=7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 9349b2260a67..bc0bbc789b8f 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.16.0
+version=0.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/MagicStack/uvloop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b003d3110baf076d3e70c85fb96a434ea67ad2f4c4ccb11cfce7e00ce8565378
+checksum=f9dcb5c4f19b2117fea6b2596089b090fadb9b0524a194d76a24e58e065807f2
 
 do_check() {
 	# For some reason, setting PYTHONPATH is not sufficient
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..3fe5bc6a6d54 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate-gtk
-version=3.20.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=9c060a9a0da9717e7c66acbfd3dfc8c556d731d83448195658219c1b4d5b21cc
diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
deleted file mode 100644
index 610c93d8ca70..000000000000
--- a/srcpkgs/qalculate-qt/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
-pkgname=qalculate-qt
-version=3.20.1
-revision=1
-build_style=qmake
-hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
-makedepends="libqalculate-devel qt5-devel"
-depends="gnuplot"
-short_desc="Multi-purpose desktop calculator - QT version"
-maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://qalculate.github.io"
-distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..6a2388c5cf4f 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,9 +1,8 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
 pkgname=qalculate
-version=3.20.1
-revision=2
+version=3.19.0
+revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -14,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=43657a96e18b91739a0ef1d0f42701d7c5a0c8a3a6c7eee8ebfe9aeda75f7ddc
 
 libqalculate_package() {
 	short_desc+=" - library files"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 53cce4facf00..6d5f8c082fa7 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.3.7
+version=4.3.6
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=42cc7abaa8a0900d20705d467cfd86732796dd22cf15c98f13bde468059cdf32
+checksum=d3094fa799bb901b81df6e380974bf4e38602fe1a7bfb268013ddffa30a7b16f
 
 do_extract() {
 	local n=${pkgname}-${version}
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index c6325d0c962f..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -1,13 +1,13 @@
 # Template file for 'qcas'
 pkgname=qcas
 version=0.5.3
-revision=2
+revision=1
 build_style=qmake
 configure_args="qcas.pro"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
-short_desc="QT frontend to Giac/Xcas"
+short_desc="The QT frontend to Giac/Xcas"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 9a1fd3435db2..06dbf272cdd2 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b70539f9f3b222e892ec1d25feab843ccad8004647cc24abedd361f5dbf06cc2
+checksum=1c0b8803512135b7c63c3978fd7230a264486b95c1bd4925e422f968a045e66f
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
new file mode 100644
index 000000000000..88e7b893e302
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
@@ -0,0 +1,372 @@
+diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 5597c69f9..2cd48907b 100644
+--- a/src/core/web_contents_adapter.cpp
++++ b/src/core/web_contents_adapter.cpp
+@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
+             m_adapterClient->loadFinished(false, request.url(), false,
+                                           net::ERR_DISALLOWED_URL_SCHEME,
+                                           QCoreApplication::translate("WebContentsAdapter",
+-                                          "HTTP-POST data can only be sent over HTTP(S) protocol"),
+-                                          false);
++                                          "HTTP-POST data can only be sent over HTTP(S) protocol"));
+             return;
+         }
+         params.post_data = network::ResourceRequestBody::CreateFromBytes(
+@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
+ 
+     GURL dataUrlToLoad(urlString);
+     if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
+-        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
++        m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
+         return;
+     }
+     content::NavigationController::LoadURLParams params((dataUrlToLoad));
+@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
+     if (m_webContents->IsLoading()) {
+         m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
+                                            QStringLiteral("Discarded"));
++        m_webContentsDelegate->DidStopLoading();
+     }
+ 
+     content::WebContents::CreateParams createParams(m_profileAdapter->profile());
+diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 267266d81..afc43806a 100644
+--- a/src/core/web_contents_adapter_client.h
++++ b/src/core/web_contents_adapter_client.h
+@@ -466,8 +466,7 @@ public:
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                              const QString &errorDescription, bool triggersErrorPage) = 0;
++    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
+     virtual void focusContainer() = 0;
+     virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
+     virtual QSharedPointer<WebContentsAdapter>
+diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
+index 1e92a46f8..f0e4130e8 100644
+--- a/src/core/web_contents_delegate_qt.cpp
++++ b/src/core/web_contents_delegate_qt.cpp
+@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
+ 
+ void WebContentsDelegateQt::LoadProgressChanged(double progress)
+ {
+-    QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
+-    int p = qMin(qRound(progress * 100), 100);
+-
+-    if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p ==  100)
++    if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
+         return;
+ 
+-    if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
+-        m_loadProgressMap[current_url] = p;
++    int p = qMin(qRound(progress * 100), 100);
++    if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
++        m_loadingInfo.progress = p;
+         m_viewClient->loadProgressChanged(p);
+     }
+ }
+@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
+     }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
++void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
+ {
+-    m_isDocumentEmpty = true;
+-    m_viewClient->loadStarted(url, isErrorPage);
+-    m_viewClient->updateNavigationActions();
+-
+-    if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
+-        && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
+-        && !m_isNavigationCommitted) {
+-        m_loadProgressMap.insert(url, 100);
+-        m_lastLoadedUrl = url;
+-        m_viewClient->loadProgressChanged(100);
++    // only report first ever load start or separate one for error page only
++    if (!isErrorPage && m_loadingInfo.isLoading()) // already running
+         return;
+-    }
+ 
+-    if (!m_loadProgressMap.isEmpty()) {
+-        QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
+-        while (it != m_loadProgressMap.end()) {
+-            if (it.value() == 100) {
+-                it = m_loadProgressMap.erase(it);
+-                continue;
+-            }
+-            ++it;
+-        }
++    m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
++    if (!isErrorPage) {
++        m_loadingInfo.progress = 0;
++        m_viewClient->loadStarted(m_loadingInfo.url, false);
++        m_viewClient->updateNavigationActions();
++        m_viewClient->loadProgressChanged(0);
++    } else {
++        m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+     }
+-
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap.insert(url, 0);
+-    m_viewClient->loadProgressChanged(0);
+ }
+ 
+ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
+@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
+     if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
+         navigation_handle->SetSilentlyIgnoreErrors();
+ 
+-    if (!navigation_handle->IsInMainFrame())
++    if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
+         return;
+ 
+ 
+     m_loadingErrorFrameList.clear();
+     m_faviconManager->resetCandidates();
+-    EmitLoadStarted(toQt(navigation_handle->GetURL()));
++
++    m_loadingInfo.url = toQt(navigation_handle->GetURL());
++    // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
++    bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
++    emitLoadStarted(isErrorPage);
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
++void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
+ {
+-    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+-    Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
+-
+-    // When error page enabled we don't need to send the error page load finished signal
+-    if (m_loadProgressMap[url] == 100)
++    if (!m_loadingInfo.isLoading()) // not currently running
+         return;
+ 
+-    m_lastLoadedUrl = url;
+-    m_loadProgressMap[url] = 100;
+-    m_isNavigationCommitted = false;
+-    m_viewClient->loadProgressChanged(100);
++    Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
++    Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
++
++    if (!isErrorPage) {
++        if (m_loadingInfo.progress < 100) {
++            m_loadingInfo.progress = 100;
++            m_viewClient->loadProgressChanged(100);
++        }
+ 
+-    m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
+-    m_viewClient->updateNavigationActions();
++        m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
++        m_viewClient->updateNavigationActions();
++    } else {
++        m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
++    }
+ }
+ 
+-void WebContentsDelegateQt::EmitLoadCommitted()
++void WebContentsDelegateQt::emitLoadCommitted()
+ {
+     m_findTextHelper->handleLoadCommitted();
+     m_viewClient->loadCommitted();
+@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+                 profileAdapter->visitedLinksManager()->addUrl(url);
+         }
+ 
+-        m_isNavigationCommitted = true;
+-        EmitLoadCommitted();
++        emitLoadCommitted();
+     }
+ 
+     // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
+@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
+         // Now report we are starting to load an error-page.
+         m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
+         m_faviconManager->resetCandidates();
+-        EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
++        emitLoadStarted(true);
+ 
+         // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
+         if (navigation_handle->HasCommitted())
+-            EmitLoadCommitted();
++            emitLoadCommitted();
+     }
+ }
+ 
+@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
+ 
+     if (m_loadingState == LoadingState::Loading)
+         setLoadingState(LoadingState::Loaded);
++
++    emitLoadFinished();
++    m_loadingInfo.clear();
+ }
+ 
+ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
+@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
+     // Delay notifying failure until the error-page is done loading.
+     // Error-pages are not loaded on failures due to abort.
+     bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
+-    EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
++    m_loadingInfo.success = false;
++    m_loadingInfo.url = url;
++    m_loadingInfo.errorCode = errorCode;
++    m_loadingInfo.errorDescription = errorDescription;
++    m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
+ }
+ 
+ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
+@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
+         Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
+         m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
+         m_viewClient->iconChanged(QUrl());
+-
+-        EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
++        emitLoadFinished(/* isErrorPage = */true);
+         return;
+     }
+     // Qt6: Consider getting rid of the error_description (Chromium already has)
+@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+         // Trigger LoadFinished signal for main frame's error page only.
+         if (!render_frame_host->GetParent()) {
+             m_viewClient->iconChanged(QUrl());
+-            EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
++            emitLoadFinished(/* isErrorPage = */true);
+         }
+ 
+         return;
+@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
+     int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
+     bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
+     bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
+-    EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
++
++    m_loadingInfo.success = http_statuscode < 400;
++    m_loadingInfo.url = toQt(validated_url);
++    m_loadingInfo.errorCode = http_statuscode;
++    m_loadingInfo.triggersErrorPage = triggersErrorPage;
+ }
+ 
+ void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
+diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
+index 5a3dff6e9..7149f6bff 100644
+--- a/src/core/web_contents_delegate_qt.h
++++ b/src/core/web_contents_delegate_qt.h
+@@ -216,9 +216,9 @@ private:
+                  WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
+                  const QUrl &url,
+                  bool user_gesture);
+-    void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
+-    void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
+-    void EmitLoadCommitted();
++    void emitLoadStarted(bool isErrorPage = false);
++    void emitLoadFinished(bool isErrorPage = false);
++    void emitLoadCommitted();
+ 
+     LoadingState determineLoadingState(content::WebContents *contents);
+     void setLoadingState(LoadingState state);
+@@ -242,9 +242,17 @@ private:
+     int m_desktopStreamCount = 0;
+     mutable bool m_pendingUrlUpdate = false;
+ 
+-    QMap<QUrl, int> m_loadProgressMap;
+-    QUrl m_lastLoadedUrl;
+-    bool m_isNavigationCommitted = false;
++    struct LoadingInfo {
++        bool success = false;
++        int progress = -1;
++        bool isLoading() const { return progress >= 0; }
++        QUrl url;
++        int errorCode = 0;
++        QString errorDescription;
++        bool triggersErrorPage = false;
++        void clear() { *this = LoadingInfo(); }
++    } m_loadingInfo;
++
+     bool m_isDocumentEmpty = true;
+     base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
+ };
+diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 6ab1c97cb..1de7f1c7f 100644
+--- a/src/webengine/api/qquickwebengineview.cpp
++++ b/src/webengine/api/qquickwebengineview.cpp
+@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
+ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
+ 
+-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                              const QString &errorDescription, bool triggersErrorPage)
++void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QQuickWebEngineView);
+-    Q_UNUSED(triggersErrorPage);
+ 
+     if (isErrorPage) {
+ #if QT_CONFIG(webengine_testsupport)
+diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index ebe55c345..ec535298b 100644
+--- a/src/webengine/api/qquickwebengineview_p_p.h
++++ b/src/webengine/api/qquickwebengineview_p_p.h
+@@ -116,8 +116,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override;
+     void loadVisuallyCommitted() override;
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index e08afed44..b32c15039 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
+     QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
+ }
+ 
+-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                                         const QString &errorDescription, bool triggersErrorPage)
++void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
+ {
+     Q_Q(QWebEnginePage);
+     Q_UNUSED(url);
+     Q_UNUSED(errorCode);
+     Q_UNUSED(errorDescription);
+ 
+-    if (isErrorPage) {
+-        QTimer::singleShot(0, q, [q](){
+-            emit q->loadFinished(false);
+-        });
++    if (isErrorPage)
+         return;
+-    }
+ 
+     isLoading = false;
+-    Q_ASSERT((success && !triggersErrorPage) || !success);
+-    if (!triggersErrorPage) {
+-        QTimer::singleShot(0, q, [q, success](){
+-            emit q->loadFinished(success);
+-        });
+-    }
++    QTimer::singleShot(0, q, [q, success](){
++        emit q->loadFinished(success);
++    });
+ }
+ 
+ void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
+diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 82ce99503..ae3ab5d25 100644
+--- a/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -107,8 +107,7 @@ public:
+     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+     void loadCommitted() override { }
+     void loadVisuallyCommitted() override { }
+-    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
+-                      const QString &errorDescription, bool triggersErrorPage) override;
++    void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
+     void focusContainer() override;
+     void unhandledKeyEvent(QKeyEvent *event) override;
+     QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
new file mode 100644
index 000000000000..0b3820466dc9
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
@@ -0,0 +1,31 @@
+From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
+Date: Thu, 20 May 2021 12:42:18 +0200
+Subject: [PATCH] Bump V8_PATCH_LEVEL
+
+Some backported patches to v8 require us to update the version string,
+otherwise stale cache files might not be cleaned properly.
+
+The V8_PATCH_LEVEL will de facto be decoupled from its upstream
+counterpart, but that should not matter in practice.
+
+Fixes: QTBUG-93744
+Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/include/v8-version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
+index cc87cda0776..298c9f74e02 100644
+--- a/src/3rdparty/chromium/v8/include/v8-version.h
++++ b/src/3rdparty/chromium/v8/include/v8-version.h
+@@ -11,7 +11,7 @@
+ #define V8_MAJOR_VERSION 8
+ #define V8_MINOR_VERSION 7
+ #define V8_BUILD_NUMBER 220
+-#define V8_PATCH_LEVEL 31
++#define V8_PATCH_LEVEL 32
+ 
+ // Use 1 for candidates and 0 otherwise.
+ // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index de219ffcc8b3..0819b3790345 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,12 +1,11 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.5
-revision=1
-_version="${version}-lts"
+version=5.15.4
+revision=2
 _commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
+_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -25,16 +24,15 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
- 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
+checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
+ fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
 
 no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
deleted file mode 100644
index 3df60789638c..000000000000
--- a/srcpkgs/qt5-webkit/patches/glib-2.68.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 7 Apr 2021 13:38:09 +0200
-Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
- >= 2.68
-
-g_object_ref_sink is defined as a macro meanwhile and so the build fails.
-Just remove the declarations, glib.h is included anyway.
----
- Source/WTF/wtf/glib/GRefPtr.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 06133d82cb35..d9a1d2f145f5 100644
---- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -29,9 +29,6 @@
- #include <algorithm>
- #include <glib.h>
- 
--extern "C" void g_object_unref(gpointer);
--extern "C" gpointer g_object_ref_sink(gpointer);
--
- namespace WTF {
- 
- enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
deleted file mode 100644
index 07a26883e7ac..000000000000
--- a/srcpkgs/qt5-webkit/patches/icu-68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig	2020-03-04 17:16:37 UTC
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..b2e7813cc45e 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=11
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index e7d329e74338..1dff88dc6cab 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20210429
 # commit d42afef0e48a102334ecfda6a492286fb9fc5996
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=3
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
  gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
  libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxslt-devel libxml2-devel cups-devel minizip-devel
+ libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
  opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
  protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
@@ -40,7 +40,7 @@ LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 if [ "$CROSS_BUILD" ]; then
 	# Need some devel packages in the host to build qmake, moc, uic, rcc
 	# wayland-devel contains /usr/bin/wayland-scanner
-	hostmakedepends+=" icu-devel wayland-devel zlib-devel libxml2-devel"
+	hostmakedepends+=" icu-devel wayland-devel zlib-devel"
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
diff --git a/srcpkgs/qt5ct/INSTALL.msg b/srcpkgs/qt5ct/INSTALL.msg
new file mode 100644
index 000000000000..ec8a74660e0d
--- /dev/null
+++ b/srcpkgs/qt5ct/INSTALL.msg
@@ -0,0 +1 @@
+To enable qt5ct restart the X11 server for the changes to take effect.
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 69d06e92481b..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.3
-revision=2
+version=1.2
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 0b3dd492fb1f..bb043213a360 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -13,7 +13,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
  -DBUILD_WITH_PCH=OFF"
-hostmakedepends="perl pkg-config xmlstarlet"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -32,7 +32,6 @@ checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
 	configure_args+=" -DQT_HOST_PATH=/usr
 	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 06837849b3f1..d64b37bff575 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.1.1
-revision=2
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr "
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 65e7a63a596c..74eb24de1628 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.0
+version=6.4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b5b05b274655a33ff8da3af9f1d827a69dc23590bbe138318774524d80a6b9d
+checksum=a09decbde9ddbeefe09b4c3febeea4cbadaf5eb0da1533acd9c03eb046b75026
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index ba66ebb1b62d..7d3ae4effa4b 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.3.1
+version=2.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://qutebrowser.org/"
 changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
 distfiles="https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"
-checksum=407aab542c0fab00de5adb4c9ec1457de498ea5c53417a72bffd7f9a7825c616
+checksum=10ad01f07b9ce75fc86cb300e69208cba3d219a5d92687efc13a2a0a5a36df25
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures
diff --git a/srcpkgs/re2c/template b/srcpkgs/re2c/template
index f994982e0dfb..882547d3f3c5 100644
--- a/srcpkgs/re2c/template
+++ b/srcpkgs/re2c/template
@@ -1,14 +1,12 @@
 # Template file for 're2c'
 pkgname=re2c
-version=2.2
+version=2.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
-checkdepends="python3"
 short_desc="Tool for generating fast C-based recognizers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://re2c.org/"
-changelog="http://re2c.org/releases/changelog/changelog.html"
 distfiles="https://github.com/skvadrik/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda
+checksum=036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6c774757a5da..a4a0c532cad2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=50
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -21,7 +21,6 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
- bomi<=0.9.11_17
  burp-server<=1.4.40_13
  burp-client<=1.4.40_13
  bzr<=2.7.0_1
@@ -69,12 +68,10 @@ replaces="
  gegl3<=0.3.28_2
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
- gespeaker<=0.8.6_3
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
- gnome-shell-mousewheel-zoom<=0.8.0_2
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
@@ -182,10 +179,6 @@ replaces="
  icecat-i18n-xh<=78.6.1_1
  icecat-i18n-zh-CN<=78.6.1_1
  icecat-i18n-zh-TW<=78.6.1_1
- ImageMagick6<=6.9.12.12_2
- libmagick6<=6.9.12.12_2
- libmagick6-devel<=6.9.12.12_2
- libmagick6-perl<=6.9.12.12_2
  ioquake3-rpi<=20130506_2
  isl16<=0.16_2
  js<=1.8.5_11
@@ -225,7 +218,6 @@ replaces="
  mutagen<=1.43.0_3
  ncdns<=0.0.2_12
  orage<=4.12.1_7
- onionshare<=2.2_5
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
  perl-Gtk2-Ex-Simple-List<=0.50_4
@@ -236,13 +228,10 @@ replaces="
  polkit-qt<=0.112.0_5
  profile-sync-daemon<=5.75_4
  profont<=1.0_2
- psiconv<=0.9.9_9
- ptii<=0.4_2
  pyside-tools<=0.2.15_2
  python-PyQt4<=4.12.1_4
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
- python-docutils<=0.16_3
  python-enchant<=2.0.0_4
  python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
@@ -328,8 +317,6 @@ replaces="
  zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
- nodejs-lts-10<=10.24.0_2
- libspa-ffmpeg<=0.3.32_1
 "
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 700c74249316..c708e079b674 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,7 +1,7 @@
 # Template file for 'retroarch'
 pkgname=retroarch
 version=1.9.7
-revision=2
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -12,13 +12,13 @@ configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
 conf_files="/etc/retroarch.cfg"
 hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
  mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
  $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
  $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
  $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
-depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)"
+depends="$(vopt_if vulkan 'vulkan-loader')"
 short_desc="Official reference frontend for the libretro API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -27,32 +27,29 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
 checksum=a4a1791dbff796dccfb377f9a61bd4b1bea4f754ab6611f51fa1d0466babbc9e
 
-build_options="ffmpeg flac glcore gles2 glslang jack miniupnpc neon pulseaudio qt5 sdl2 vulkan wayland x11"
-build_options_default="ffmpeg flac glcore glslang miniupnpc pulseaudio sdl2 vulkan wayland x11"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
 
-desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+"
 desc_option_glslang="Enable support for GLSL shaders"
 desc_option_miniupnpc="Enable support for NAT traversal"
 desc_option_neon="Enable support for ARM Neon SIMD extension"
 
-vopt_conflict glcore gles2 # gles2 disables glcore support
-
 if [ "$build_option_gles2" ]; then
 	configure_args+=" --enable-opengles --enable-opengles3"
 else
 	configure_args+=" --disable-opengles --disable-opengles3"
 fi
 
-if [ "$build_option_glcore" ]; then
+if [ "$build_option_opengl" ]; then
 	if [ -z "$build_option_glslang" ]; then
-		msg_error "$pkgname: 'glcore' option requires 'glslang'.\n"
+		msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
 	fi
 	configure_args+=" --enable-opengl_core"
 else
 	configure_args+=" --disable-opengl_core"
 fi
 
-if [ "$build_option_gles2" -o "$build_option_glcore" ]; then
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
 	configure_args+=" --enable-egl --enable-kms"
 	makedepends+=" MesaLib-devel"
 fi
@@ -70,8 +67,8 @@ if [ "$build_option_vulkan" ]; then
 fi
 
 if [ "$build_option_wayland" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
 	fi
 	makedepends+=" wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
@@ -80,8 +77,8 @@ if [ "$build_option_wayland" ]; then
 fi
 
 if [ "$build_option_x11" ]; then
-	if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then
-		msg_error "$pkgname: 'x11' option requires 'gles2' or 'glcore'.\n"
+	if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+		msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
 	fi
 fi
 
diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch
deleted file mode 100644
index 756744d1a951..000000000000
--- a/srcpkgs/ripright/patches/imagemagick7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- PKG_CHECK_MODULES([flac], [flac >= 1.1.4])
--PKG_CHECK_MODULES([MagickWand], [Wand])
-+PKG_CHECK_MODULES([MagickWand], [MagickWand])
- PKG_CHECK_MODULES([libcurl], [libcurl])
- PKG_CHECK_MODULES([libdiscid], [libdiscid])
- AC_CHECK_LIB([cdda_paranoia], [paranoia_init])
---- a/src/art.c
-+++ b/src/art.c
-@@ -24,7 +24,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index fcdec80435b4..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,17 +1,13 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
+hostmakedepends="pkg-config"
+makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"
 short_desc="Minimal automatic CD ripper"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-only"
-homepage="https://www.mcternan.me.uk/ripright/"
-distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
+homepage="http://www.mcternan.me.uk/ripright/"
+distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz"
 checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 1566aac51f5a..e48f0312e162 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,6 +1,6 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
-version=1.6.2
+version=1.6.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
@@ -11,8 +11,8 @@ short_desc="Raspberry Pi Imaging Utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/raspberrypi/rpi-imager"
-distfiles="https://github.com/raspberrypi/rpi-imager/archive/v${version}.tar.gz"
-checksum=32f7fcd732ed8b707e862f51311c846b13a9dfb805cc6d901c601e2e5c2ec2d7
+distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
+checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
 
 pre_configure() {
 	ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 81a8c484d0a3..8067f5d7ab7f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,23 +1,16 @@
 # Template file for 'rpi-kernel'
 #
 # We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspbian distribution. This is currently 5.4:
 #
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
-#
-# Commit hash is picked from latest tag [1], if appropriate, or from latest
-# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
-#
-# [1] https://github.com/raspberrypi/linux/releases
-#
-# WARNING: keep all rpi*-kernel packages in sync
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv6l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -27,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -148,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -158,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index cc861a0a261a..cda240234550 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi2-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi2-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="armv7l*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -137,7 +141,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -147,7 +151,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 0dd5ce9593db..a3a16bc577fc 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,12 +1,16 @@
 # Template file for 'rpi3-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi3-kernel
-version=5.10.52
-revision=1
+version=5.4.83
+revision=2
 archs="aarch64*"
 wrksrc="linux-${_githash}"
 hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 3 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 
 _kernver="${version}_${revision}"
@@ -140,7 +144,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -150,7 +154,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index 9ddae3fac5a3..04fbb7d64bb4 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,11 +1,15 @@
 # Template file for 'rpi4-kernel'
-# See rpi-kernel for version policy
+#
+# We track the latest Raspberry Pi LTS kernel as that is what is used in the
+# official Raspbian distribution. This is currently 5.4:
+#
+#   https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769
 
-_githash="86729e78125d4f3d203457940feee8bc97b11f6c"
+_githash="76c49e60e742d0bebd798be972d67dd3fd007691"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi4-kernel
-version=5.10.52
+version=5.4.83
 revision=1
 archs="aarch64*"
 wrksrc="linux-${_githash}"
@@ -16,7 +20,7 @@ homepage="http://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=a25a7dfce4c2ca5bdca39ddab5e43539d9b04900b0dbefe19f4f9b053e59968c
+checksum=4a98ea0d68c6e74d479789c12fc97619c872cb2607ae87a881a9491c1c3fbc35
 python_version=3
 conflicts=rpi3-kernel
 
@@ -141,7 +145,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${_arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${_arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -151,7 +155,7 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
 	for i in acpi asm-generic clocksource config crypto drm generated linux \
-		math-emu media net pcmcia scsi sound trace uapi vdso video xen; do
+		math-emu media net pcmcia scsi sound trace uapi video xen; do
 		[ -d include/$i ] && cp -a include/$i ${hdrdest}/include
 	done
 
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c3eade261225..dcd1f1255317 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+ qt5-host-tools which nodejs-lts-10"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
diff --git a/srcpkgs/rustup/INSTALL.msg b/srcpkgs/rustup/INSTALL.msg
new file mode 100644
index 000000000000..45e8be341e53
--- /dev/null
+++ b/srcpkgs/rustup/INSTALL.msg
@@ -0,0 +1 @@
+Please run rustup-init after initial install to use rustup.
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 44d9a4993329..294f5b020a08 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.24.1
-revision=2
+revision=1
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cde..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
-revision=1
+version=0.5.15
+revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index bef14573ec5b..708abb75f5d2 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.32.0
+version=2.31.0
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=db74d1fa2d2ce22f18d4c2d1d7fae64ad018302eac4803b837de1c083970c771
+checksum=b271d1da7ae57eb082da969abb6ae38c55a3f50e126af4afbe4b77bdefc0174b
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 4bd23c7bdd0d..0921a40dba22 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.7
+version=2.1.6
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc"
@@ -12,7 +12,7 @@ license="custom:BSD+public_domain"
 homepage="http://www.sbcl.org/"
 changelog="http://www.sbcl.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=12606f153832ae2003d2162a6b3a851a5e8969ccbbf7538d2b0fb32d17ea1dc6
+checksum=8b210c5dd20a466ca438bc7f628812640d0b4acdfad20bec168a6a5dabc1cdef
 nocross=yes
 nopie=yes
 
@@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
-	checksum+=" 4a09d891c2b5a0214bf6ddb348c53abfb540f192d552adb03a22271961a9b458"
+	checksum+=" d120765fe5148de7cec23f0b20d9bbf92b03d7f4429d1754a95898c43323e367"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
diff --git a/srcpkgs/sc-im/template b/srcpkgs/sc-im/template
index 2c7a468c33c6..638d0cc797ad 100644
--- a/srcpkgs/sc-im/template
+++ b/srcpkgs/sc-im/template
@@ -1,14 +1,13 @@
 # Template file for 'sc-im'
 pkgname=sc-im
 version=0.8.2
-revision=2
+revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
 make_build_args="prefix=/usr CFLAGS+=-DXLS LDLIBS+=-lxlsreader"
 make_install_args="prefix=/usr"
 hostmakedepends="bison pkg-config gnuplot which"
-makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel
- lua51-devel ncurses-devel"
+makedepends="libxls-devel libxlsxwriter-devel libxml2-devel libzip-devel lua51-devel"
 depends="less"
 short_desc="SpreadSheet Calculator (sc) Improvised"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 136d6e4a1fbf..9aeb910322df 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=5
+revision=4
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 7565f4303e7e..fe8ae3006c5a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,17 +1,17 @@
 # Template file for 'scrot'
 pkgname=scrot
-version=1.6
+version=1.5
 revision=1
 build_style=gnu-configure
 make_install_args="docsdir=/usr/share/doc/scrot"
-hostmakedepends="automake autoconf-archive pkg-config"
-makedepends="libXcomposite-devel libXcursor-devel imlib2-devel libXext-devel"
+hostmakedepends="automake autoconf-archive"
+makedepends="libXcomposite-devel libXcursor-devel giblib-devel imlib2-devel"
 short_desc="Simple command-line screenshot utility for X"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT"
 homepage="https://github.com/resurrecting-open-source-projects/scrot"
 distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=5d53df3e86220b8aca21be03a39b542905f2a8a0ccd950fdce7fc48a32c09050
+checksum=87afba3998aac097f13231f3b0452c21188bf4b5cc6ac0747693a1da1a0ae40f
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 25dc389f8fcc..4220c71bc897 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e4845375ded8d8b1279a340f8c9feed573c301cf1c2b7f9fd2b5288444c34022
+checksum=f705397b66dae8c3ddeb0787d9831c0c8beae6347b7c00070597de327110e4b2
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 64b34e431eda..a0778f3afafb 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'sdparm'
 pkgname=sdparm
-version=1.12
+version=1.11
 revision=1
 build_style=gnu-configure
 makedepends="sg3_utils-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://sg.danny.cz/sg/sdparm.html"
 distfiles="http://sg.danny.cz/sg/p/${pkgname}-${version}.tgz"
-checksum=e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124
+checksum=432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..6005911c87e4 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,6 +1,6 @@
 # Template file for 'sequeler'
 pkgname=sequeler
-version=0.8.2
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
@@ -11,4 +11,4 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Alecaddd/sequeler"
 distfiles="https://github.com/Alecaddd/sequeler/archive/v${version}.tar.gz"
-checksum=66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+checksum=52adc7669e4729a114cdf8de4dc9d2575ea484bbc112a4b8bc80e694ebc45842
diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 676dc2884df6..d9e55ffb62bb 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.0
+version=0.9.24
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Rubén Santos <kojicomics@cocaine.ninja>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=46bf3336046789e5001541588c27af92f517a017d8cd377d0feeb64268e5687a
+checksum=0d45e2fc62c5bc29b6cfe08eb7f2f08b50039ce38b0bdc3028fb85ff63681060
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sfeed_curses/template b/srcpkgs/sfeed_curses/template
index e01809732949..bb9401729c71 100644
--- a/srcpkgs/sfeed_curses/template
+++ b/srcpkgs/sfeed_curses/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed_curses'
 pkgname=sfeed_curses
-version=1.0
+version=0.9.12
 revision=1
 build_style=gnu-makefile
 make_use_env=compliant
@@ -12,7 +12,7 @@ maintainer="Jaume Devesa <jaume@mailbox.org>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed_curses"
 distfiles="https://codemadness.org/releases/sfeed_curses/${pkgname}-${version}.tar.gz"
-checksum=f90b26e19e3c4457c88d430ecfccf428576d9af1d560240ac1dc3c11b73e4c12
+checksum=d08a481c6a4f74cac3e16bda6c5373fe4ce068afa11a09d75b727e07b739d581
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
deleted file mode 100644
index fda2729bd65c..000000000000
--- a/srcpkgs/sftpgo/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'sftpgo'
-pkgname=sftpgo
-version=2.1.0
-revision=1
-build_style=go
-go_import_path=github.com/drakkan/sftpgo
-short_desc="Fully featured and highly configurable SFTP server"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
-homepage="https://github.com/drakkan/sftpgo"
-distfiles="https://github.com/drakkan/sftpgo/archive/refs/tags/v$version.tar.gz"
-checksum=d04d75f1baee9d4510e40240e1b24b075430244abda8f7daef5922f5f3ca7fa9
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index a4e953367ced..f465792f603b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.3.1
+version=3.3.0
 revision=1
 wrksrc="sh-${version}"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/mvdan/sh"
 distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
-checksum=c3acf5503e42f481ff3ec133007f85438a2df378981446456937a56dde758a52
+checksum=9bcdbbfd2f6afc4e885838683396483edcd87ef7eb80faa7def6ff0a10e3be4a
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
deleted file mode 100644
index 0cd56601f58d..000000000000
--- a/srcpkgs/shiori/files/shiori/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
deleted file mode 100644
index 9a7ec9528226..000000000000
--- a/srcpkgs/shiori/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'shiori'
-pkgname=shiori
-version=1.5.0
-revision=1
-build_style=go
-go_import_path=github.com/go-shiori/shiori
-short_desc="Simple bookmark manager built with Go"
-maintainer="Frank Steinborn <steinex@nognu.de>"
-license="MIT"
-homepage="https://github.com/go-shiori/shiori"
-distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=c2ebc0f009feb22f891c7ab0fa7b8c0d71e1cfc34a974c7503a702ec07d8e9ee
-
-system_accounts="_shiori"
-_shiori_homedir="/var/lib/shiori"
-_shiori_descr="shiori bookmark manager"
-
-make_dirs="/var/lib/shiori 0700 _shiori _shiori"
-
-post_install() {
-	vsv shiori
-	vlicense LICENSE
-}
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index d0e7d67586f9..5ad51345b231 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -7,8 +7,8 @@ configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt7-devel mlt7-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols2-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
 depends="frei0r-plugins qt5-graphicaleffects qt5-quickcontrols"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 3b1d7dec047a..a9c2820763a3 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.7.0
+version=1.6.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=f8ea3c11a33bb54de3de1b401fb7ec8d440a5a63277c4d7ed32a29ba629eac66
+checksum=ea0e41a56fa98d54c61e2148c6d4b152bd50d8faa59a95c148c8b32b058dacda
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index c83932189c32..9b6187c0e978 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=be19939bf032cef9da0c9b314cf2c4a8290549a0e44759e3b0f54a3cc2252f72
+checksum=6633c0216b1446a6ca81536241172dea6eb04300c567603301c39c8a46e96f63
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..8e9f28786b9e 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1a8823ce246f..2aa5a5cc4fe5 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.1.1
+version=6.1.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=52d25af2fcd764c4e15cc9cd1350bdb0e63f52dfa2aa3c5e7679af7fde9f7e20
+checksum=f069d550dd819609e019e5dc58fc5193e081c7f3fb4f7dc8f9be734e34d4e56e
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 84c1cf6053d8..5c975d99ff39 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.30.0
+version=1.28.1
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=3a40dc813a1e6ca786566c3eb3c6099aadb66e590798bc8bcd774aa09357b764
+checksum=4d96d820d48934b3c12415697146ec30318e235f3a35d4fc68024cda30b655ef
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 769b8d1cdda3..07284734b107 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.4.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=f5f9d0e2d3dfdc9f1897ae3c3289d7a066150747bbb7c8f71ac5f76165b62bfb
+checksum=5d699bc0f50a7af6f8eb5222cd7f88f8c3b36d951425de74244eae98568f06ae
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 359884d67c58..3aede5163710 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.75.0.140
+version=8.73.0.129
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=693780f72710703f08fbb93a1cc5c5348e9b99b8e31639dc67bea9be6a4e35b7
+checksum=b72dcad634f922c77a0531f58d699d657f91939480d8299d9ae649abf01fc6c8
 repository="nonfree"
 nostrip="yes"
 
diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index bdbd6bb2effd..03dddc195145 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.18.0
+version=4.17.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=701a8bd2a6c0e793b35092f147dd6639e66a1860ad300088a988f39d45ac0db6
+checksum=b1e7123f9e51d292b647fecd42236f2de3b3f863c631e8278d47e08b8aae8c1d
 restricted=yes
 repository="nonfree"
 nopie=yes
diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template
index d95af662dcc0..f7d3ebf142f5 100644
--- a/srcpkgs/sleuthkit/template
+++ b/srcpkgs/sleuthkit/template
@@ -1,6 +1,6 @@
 # Template file for 'sleuthkit'
 pkgname=sleuthkit
-version=4.11.0
+version=4.10.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ license="GPL-2.0-only, IPL-1.0, CPL-1.0"
 homepage="https://www.sleuthkit.org/"
 changelog="https://github.com/sleuthkit/sleuthkit/releases"
 distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
-checksum=f0c0e7a72135c6033a40f87514808e8d0d81716a719a29face3980897037bf95
+checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
 
 post_extract() {
 	sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..79839a6fdca4 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index fc711bec335d..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
-version=21.8.0
-revision=1
+version=21.1.0
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"
@@ -12,14 +12,14 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.smplayer.info"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5bcdb175303baf590eaa91163043f23cfab1901ac15e7da24b4d674f1822163
+checksum=634baadf65e843c7e92090d27117c0ee9dd161deb1d4f5994ac63201860a7ff7
 
 export QT_SELECT=5
 
 pre_build() {
-	vsed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-	vsed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
-	vsed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
+	sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
+	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' Makefile
+	sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
 }
 
 do_build() {
diff --git a/srcpkgs/snowball/patches/libstemmer-library.patch b/srcpkgs/snowball/patches/libstemmer-library.patch
deleted file mode 100644
index 4dbb89061bee..000000000000
--- a/srcpkgs/snowball/patches/libstemmer-library.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-based on alpine patches which are based on gentoo patches
-https://gitlab.alpinelinux.org/alpine/aports/-/blob/d16eed94064539a7a1f0242709e8d7b76448c51a/community/snowball/libstemmer-library.patch
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -165,7 +165,7 @@
- CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
- CPPFLAGS=-Iinclude
- 
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.so libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
- 
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
- 
-+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(shell echo $(SNOWBALL_VERSION) | cut -d. -f1),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
-+
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
---- /dev/null
-+++ b/libstemmer/symbol.map
-@@ -0,0 +1,6 @@
-+SB_STEMMER_0 {
-+    global:
-+        sb_stemmer_*;
-+    local:
-+        *;
-+};
diff --git a/srcpkgs/snowball/template b/srcpkgs/snowball/template
deleted file mode 100644
index 784d281e1453..000000000000
--- a/srcpkgs/snowball/template
+++ /dev/null
@@ -1,60 +0,0 @@
-# Template file for 'snowball'
-pkgname=snowball
-version=2.1.0
-revision=1
-build_style=gnu-makefile
-build_helper=qemu
-make_check_target=check_stemtest # other checks are missing targets in the makefile
-hostmakedepends="perl"
-short_desc="Small string processing language for creating stemming algorithms"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="BSD-3-Clause"
-homepage="https://snowballstem.org/"
-distfiles="https://github.com/snowballstem/snowball/archive/refs/tags/v${version}.tar.gz"
-checksum=24ae0b28d6531190c2cd960d515ec9374d3a3d9420c4a0accdf89b7f02fc9caa
-
-post_patch() {
-	if [ -n "$CROSS_BUILD" ]; then
-		vsed -i GNUmakefile \
-			-e 's|\t\./snowball|\tqemu-${XBPS_TARGET_QEMU_MACHINE}-static ./snowball|'
-	fi
-}
-
-do_install() {
-	vbin snowball
-	vbin stemwords
-
-	vinstall include/libstemmer.h 644 usr/include
-	vinstall libstemmer.so.$version 644 usr/lib
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so
-	ln -s libstemmer.so.$version ${DESTDIR}/usr/lib/libstemmer.so.${version%.*.*}
-
-	# the static library has .o suffix
-	# https://github.com/snowballstem/snowball/pull/150
-	vinstall libstemmer.o 644 usr/lib libstemmer.a
-
-	vlicense COPYING
-}
-
-# XXX: upstream doesn't generate a dynamic library for libstemmer
-# each distribution patches this on their own:
-# Arch: https://github.com/archlinux/svntogit-packages/tree/packages/snowball/trunk
-# Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/snowball
-# Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/snowball-stemmer
-
-libstemmer_package() {
-	short_desc="Stemming algorithm library"
-	pkg_install() {
-		vmove "usr/lib/libstemmer.so.*"
-	}
-}
-
-libstemmer-devel_package() {
-	depends="libstemmer>=${version}_${revision}"
-	short_desc="Stemming algorithm library - development files"
-	pkg_install() {
-		vmove usr/lib/libstemmer.a
-		vmove usr/lib/libstemmer.so
-		vmove usr/include
-	}
-}
diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 4ded1d1c9281..96720d648ede 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce206399ca3b8d727d17ee00e6cd8139dc85650431e4cab3f932ec01270e2b1
+checksum=d85afa9fd7f5e19aef639f6e1cebedc92255f0dfb24bbf57a15c89b57288cb76
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 4e34e8a58322..184a4d891698 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
 # Template file for 'spdlog'
 pkgname=spdlog
-version=1.9.1
-revision=1
+version=1.8.2
+revision=2
 build_style=cmake
 configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
  -DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
 makedepends="fmt-devel"
 depends="libspdlog>=${version}_${revision} fmt-devel"
 short_desc="Fast C++ logging library"
-maintainer="skmpz <dem.procopiou@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/gabime/spdlog"
 distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
+checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index f60caae87d75..df6c91a6878a 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,15 +2,15 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.14
+version=3.13
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="CC-BY-3.0"
+license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=f3a4eaf058cf7e37e7c36fe6fc50aa037367327b429c84babd6b29bea5c2e200
+checksum=56c58e4a59d7f87ad3387367e861524033535b8f5239a63b26adf5cce9662839
 
 do_install() {
 	vmkdir usr/share/spdx
diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index e8d19a55043b..6738f97b34de 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8c47d6c7f06ec031020c4e09010cd243d51e4b5b2fb296e36c508050455a30a3
+checksum=5715ace40aaacb576d87674c032dc3b329c7e10bf1deb313f7825808a2b25a20
diff --git a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch b/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
deleted file mode 100644
index 7f6e063e34e0..000000000000
--- a/srcpkgs/spotify-qt/patches/disable-crash-handler.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -26,11 +26,6 @@
- # Version macros
- target_compile_definitions(spotify-qt-lib PUBLIC LIB_VERSION="v${PROJECT_VERSION}")
- 
--# Check if using GCC for crash handler support
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--	target_compile_definitions(spotify-qt-lib PRIVATE IS_GNU_CXX)
--endif ()
--
- # Link optional libraries
- if (LIB_QT_LIBRARIES)
- 	target_link_libraries(spotify-qt-lib PRIVATE ${LIB_QT_LIBRARIES})
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index af3179dd2b91..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.7
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5338c83d49e3aefd287e78856666f42e4f921631bcc9fbe13a2ec8543c835ad8
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index b20c8cfc3ecc..a0645646d0f6 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.8
+version=1.5.7
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a4302858bcf7791334e8f7165885369898330aa547888db0e73576b53f96771d
+checksum=b5d7bd6bfee2fcce2f84b332a9c337d45c37343c53b5793cc4141db77789db70
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch b/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
deleted file mode 100644
index 837e9c28249b..000000000000
--- a/srcpkgs/sslh/patches/backport-fix-for-libconfig-1.7.3.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From: yrutschle <git1@rutschle.net>
-Date: Wed, 23 Jun 2021 11:48:59 +0200
-Subject: fix for libconfig 1.7.3
-
-
-diff --git a/sslh-conf.c b/sslh-conf.c
-index 2fd0eaf..530ef6b 100644
---- a/sslh-conf.c
-+++ b/sslh-conf.c
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -48,6 +48,18 @@
- /* This gets included in the output .c file */
- 
- 
-+/* Libconfig 1.4.9 is still used by major distributions
-+ * (e.g. CentOS7) and had a different name for
-+ * config_setting_lookup */
-+#if LIBCONFIG_VER_MAJOR == 1
-+#if LIBCONFIG_VER_MINOR == 4
-+#if LIBCONFIG_VER_REVISION == 9
-+#define config_setting_lookup config_lookup_from
-+#endif
-+#endif
-+#endif
-+
-+
- /* config_type, lookup_fns, type2str are related, keep them together */
- typedef enum {
-     CFG_BOOL,
-@@ -114,6 +126,14 @@ typedef int config_t;
-         return 0; \
-     }
- 
-+enum {
-+    CONFIG_TYPE_INT,
-+    CONFIG_TYPE_BOOL,
-+    CONFIG_TYPE_INT64,
-+    CONFIG_TYPE_FLOAT,
-+    CONFIG_TYPE_STRING
-+};
-+
- make_config_setting_lookup(bool);
- make_config_setting_lookup(int);
- make_config_setting_lookup(int64);
-@@ -122,10 +142,14 @@ make_config_setting_lookup(string);
- 
- make_config_setting_get(bool, int);
- make_config_setting_get(int, int);
--make_config_setting_get(int64, int);
-+make_config_setting_get(int64, long long int);
- make_config_setting_get(float, double);
- make_config_setting_get(string, char*);
- 
-+config_setting_t* config_root_setting(config_t* c) {
-+    return NULL;
-+}
-+
- config_setting_t* config_lookup(config_t* c, const char* b) {
-     return NULL;
- }
-@@ -134,10 +158,38 @@ void config_init(config_t* c) {
-     return;
- }
- 
-+char* config_setting_name(config_setting_t* c) {
-+    return NULL;
-+}
-+
-+int config_setting_is_list(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_array(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_is_scalar(config_setting_t* c) {
-+    return 0;
-+}
-+
-+int config_setting_index(const config_setting_t *setting) {
-+    return 0;
-+}
-+
- config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
-     return NULL;
- }
- 
-+int config_setting_remove(config_setting_t* cfg, char* name) {
-+    return 0;
-+}
-+
-+int config_setting_type(config_setting_t* s) {
-+    return -1;
-+}
-+
- int config_setting_length(config_setting_t* a) {
-     return 0;
- }
-@@ -159,13 +211,30 @@ char* config_error_text(config_t* c) {
- }
- #endif
- 
-+/* This is the same as config_setting_lookup_string() except
-+it allocates a new string which belongs to the caller */
-+static int myconfig_setting_lookup_stringcpy(
-+        const config_setting_t* setting, 
-+        const char* name, 
-+        char** value)
-+{
-+    const char* str;
-+    *value = NULL;
-+    if (config_setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
-+        asprintf(value, "%s", str);
-+        return CONFIG_TRUE;
-+    } else {
-+        return CONFIG_FALSE;
-+    }
-+}
-+
- typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
- lookup_fn lookup_fns[] = {
-     (lookup_fn)config_setting_lookup_bool,
-     (lookup_fn)config_setting_lookup_int,
-     (lookup_fn)config_setting_lookup_int64,
-     (lookup_fn)config_setting_lookup_float,
--    (lookup_fn)config_setting_lookup_string,
-+    (lookup_fn)myconfig_setting_lookup_stringcpy,
-     NULL,  /* CFG_GROUP */
-     NULL,  /* CFG_ARRAY */
-     NULL,  /* CFG_LIST */
-@@ -380,6 +449,7 @@ struct arg_file* sslhcfg_conffile;
-  struct arg_str* sslhcfg_chroot;
-  struct arg_str* sslhcfg_syslog_facility;
-  struct arg_str* sslhcfg_on_timeout;
-+ struct arg_str* sslhcfg_prefix;
-  	struct arg_str* sslhcfg_listen;
-  	struct arg_str* sslhcfg_ssh;
-  	struct arg_str* sslhcfg_tls;
-@@ -392,7 +462,7 @@ struct arg_file* sslhcfg_conffile;
-  	struct arg_str* sslhcfg_anyprot;
-  struct arg_end* sslhcfg_end;
- 
--                                                                                                                    
-+                                                                                                                                      
- static struct config_desc table_sslhcfg_protocols[] = {
- 
- 
-@@ -460,6 +530,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "fork", 
-             /* type */          CFG_BOOL, 
-@@ -492,6 +578,22 @@ static struct config_desc table_sslhcfg_protocols[] = {
-             /* default_val*/    .default_val.def_bool = 0 
-         },
- 
-+        { 
-+            /* name */          "transparent", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_protocols_item, transparent),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "log_level", 
-             /* type */          CFG_INT, 
-@@ -589,7 +691,7 @@ static struct config_desc table_sslhcfg_protocols[] = {
-         },
- 	{ 0 }
- };
--                                    
-+                                             
- static struct config_desc table_sslhcfg_listen[] = {
- 
- 
-@@ -625,6 +727,22 @@ static struct config_desc table_sslhcfg_listen[] = {
-             /* default_val*/    .default_val.def_string = NULL 
-         },
- 
-+        { 
-+            /* name */          "is_udp", 
-+            /* type */          CFG_BOOL, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        NULL,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_listen_item, is_udp),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(int), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_bool = 0 
-+        },
-+
-         { 
-             /* name */          "keepalive", 
-             /* type */          CFG_BOOL, 
-@@ -642,7 +760,7 @@ static struct config_desc table_sslhcfg_listen[] = {
-         },
- 	{ 0 }
- };
--                                                                                                    
-+                                                                                                             
- static struct config_desc table_sslhcfg[] = {
- 
- 
-@@ -822,6 +940,22 @@ static struct config_desc table_sslhcfg[] = {
-             /* default_val*/    .default_val.def_string = "ssh" 
-         },
- 
-+        { 
-+            /* name */          "prefix", 
-+            /* type */          CFG_STRING, 
-+            /* sub_group*/      NULL,
-+            /* arg_cl */        & sslhcfg_prefix,
-+            /* base_addr */     NULL,
-+            /* offset */        offsetof(struct sslhcfg_item, prefix),
-+            /* offset_len */    0,
-+            /* offset_present */ 0,
-+            /* size */          sizeof(char*), 
-+            /* array_type */    -1,
-+            /* mandatory */     0, 
-+            /* optional */      0, 
-+            /* default_val*/    .default_val.def_string = "" 
-+        },
-+
-         { 
-             /* name */          "listen", 
-             /* type */          CFG_LIST, 
-@@ -859,7 +993,7 @@ static struct compound_cl_target sslhcfg_anyprot_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "anyprot" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -867,7 +1001,7 @@ static struct compound_cl_target sslhcfg_socks5_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "socks5" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -875,7 +1009,7 @@ static struct compound_cl_target sslhcfg_adb_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "adb" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -883,7 +1017,7 @@ static struct compound_cl_target sslhcfg_http_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "http" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -891,7 +1025,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "xmpp" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
- 	{ 0 }
- };
- 
-@@ -899,8 +1033,8 @@ static struct compound_cl_target sslhcfg_tinc_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -908,8 +1042,8 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -917,8 +1051,8 @@ static struct compound_cl_target sslhcfg_tls_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
--	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -926,9 +1060,9 @@ static struct compound_cl_target sslhcfg_ssh_targets [] = {
- 	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "ssh" },
- 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
- 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
--	{ & table_sslhcfg_protocols[4], 0, .value.def_bool = 1 },
--	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
- 	{ & table_sslhcfg_protocols[5], 0, .value.def_bool = 1 },
-+	{ & table_sslhcfg_protocols[8], 0, .value.def_int = 1 },
-+	{ & table_sslhcfg_protocols[6], 0, .value.def_bool = 1 },
- 	{ 0 }
- };
- 
-@@ -942,7 +1076,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: listen */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_listen,
--            .base_entry =      & table_sslhcfg [11],
-+            .base_entry =      & table_sslhcfg [12],
-             .targets =         sslhcfg_listen_targets,
- 
- 
-@@ -954,7 +1088,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: ssh */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_ssh,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_ssh_targets,
- 
- 
-@@ -966,7 +1100,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tls */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tls,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tls_targets,
- 
- 
-@@ -978,7 +1112,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: openvpn */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_openvpn,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_openvpn_targets,
- 
- 
-@@ -990,7 +1124,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: tinc */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_tinc,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_tinc_targets,
- 
- 
-@@ -1002,7 +1136,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: xmpp */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_xmpp,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_xmpp_targets,
- 
- 
-@@ -1014,7 +1148,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: http */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_http,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_http_targets,
- 
- 
-@@ -1026,7 +1160,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: adb */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_adb,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_adb_targets,
- 
- 
-@@ -1038,7 +1172,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: socks5 */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_socks5,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_socks5_targets,
- 
- 
-@@ -1050,7 +1184,7 @@ static struct compound_cl_arg compound_cl_args[] = {
-         {   /* arg: anyprot */
-             .regex =           "(.+):(\\w+)",
-             .arg_cl =          & sslhcfg_anyprot,
--            .base_entry =      & table_sslhcfg [12],
-+            .base_entry =      & table_sslhcfg [13],
-             .targets =         sslhcfg_anyprot_targets,
- 
- 
-@@ -1108,7 +1242,7 @@ static void print_setting(config_type type, void* val)
- 
- /* Changes all dashes to underscores in a string of
- * vice-versa */
--void strswap_ud(const char target, char* str)
-+static void strswap_ud(const char target, char* str)
- {
-     char* c;
-     for (c = str; *c; c++)
-@@ -1118,7 +1252,7 @@ void strswap_ud(const char target, char* str)
- 
- /* Same as config_setting_lookup() but looks up with dash or
- * underscore so `my_setting` and `my-setting` match the same */
--config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
-+static config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_desc* desc)
- {
-     config_setting_t* setting;
-     char name[strlen(desc->name)+1];;
-@@ -1134,7 +1268,7 @@ config_setting_t* config_setting_lookup_ud(config_setting_t* cfg, struct config_
-     return setting;
- }
- 
--int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
-+static int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *desc)
- {
-     lookup_fn lookup_fn = lookup_fns[desc->type];
-     char name[strlen(desc->name)+1];;
-@@ -1148,6 +1282,22 @@ int lookup_typed_ud(config_setting_t* cfg, void* target, struct config_desc *des
-     return lookup_fn(cfg, name, ((char*)target) + desc->offset);
- }
- 
-+/* Removes a setting, trying both underscores and dashes as
-+* name (so deleting 'my-setting' deletes both 'my_setting'
-+* and 'my-setting') */
-+static int setting_delete_ud(config_setting_t* cfg, struct config_desc *desc)
-+{
-+    char name[strlen(desc->name)+1];;
-+    strcpy(name, desc->name);
-+
-+    strswap_ud('_', name);
-+    if (config_setting_remove(cfg, name) == CONFIG_TRUE)
-+        return CONFIG_TRUE;
-+
-+    strswap_ud('-', name);
-+    return config_setting_remove(cfg, name);
-+}
-+
- /* When traversing configuration, allocate memory for plural
- * types, init for scalars */
- static void read_block_init(void* target, config_setting_t* cfg, struct config_desc* desc)
-@@ -1232,6 +1382,7 @@ static int read_block_setval(void* target,
-                 TRACE_READ(("[%d] = ", i));
-                 print_setting(desc->array_type, (char*)block + desc->size *i); TRACE_READ(("\n"));
-             }
-+            setting_delete_ud(cfg, desc);
-         }
-         break;
- 
-@@ -1253,6 +1404,7 @@ static int read_block_setval(void* target,
-                 return 0;
-             }
-             print_setting(desc->type, (((char*)target) + desc->offset));
-+            setting_delete_ud(cfg, desc);
-             in_cfg = 1;
-         } else {
-             TRACE_READ((" not in config file"));
-@@ -1544,6 +1696,86 @@ static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
-     return 1;
- }
- 
-+/* Allocates a new string that represents the setting value, which must be a scalar */
-+static void scalar_to_string(char** strp, config_setting_t* s)
-+{
-+    switch(config_setting_type(s)) {
-+    case CONFIG_TYPE_INT:
-+        asprintf(strp, "%d\n", config_setting_get_int(s));
-+        break;
-+
-+    case CONFIG_TYPE_BOOL:
-+        asprintf(strp, "%s\n", config_setting_get_bool(s) ?  "[true]" : "[false]" );
-+        break;
-+
-+    case CONFIG_TYPE_INT64:
-+        asprintf(strp, "%lld\n", config_setting_get_int64(s));
-+        break;
-+
-+    case CONFIG_TYPE_FLOAT:
-+        asprintf(strp, "%lf\n", config_setting_get_float(s));
-+        break;
-+
-+    case CONFIG_TYPE_STRING:
-+        asprintf(strp, "%s\n", config_setting_get_string(s));
-+        break;
-+
-+    default: /* This means a bug */
-+        fprintf(stderr, "Unexpected type %d\n", config_setting_type(s));
-+        exit(1);
-+    }
-+}
-+
-+/* Typesets all the settings in a configuration as a
-+* newly-allocated string. The string management is caller's
-+* responsability. 
-+* Returns the number of scalars in the configuration */
-+static int cfg_as_string(config_setting_t* parent, const char* path, char** strp)
-+{
-+    int i, len, res = 0;
-+    config_setting_t* child;
-+    char* subpath, *value, *old;
-+    const char* name;
-+
-+    len = config_setting_length(parent);
-+    for (i = 0; i < len; i++) {
-+        child = config_setting_get_elem(parent, i);
-+        name = config_setting_name(child);
-+        if (!name) name = "";
-+
-+        if(config_setting_is_list(parent) ||
-+           config_setting_is_array(parent)) {
-+            asprintf(&subpath, "%s[%d]%s", path, config_setting_index(child), name);
-+        } else {
-+            asprintf(&subpath, "%s/%s", path, name);
-+        }
-+
-+        if (config_setting_is_scalar(child)) {
-+            scalar_to_string(&value, child);
-+
-+            /* Add value to the output string  */
-+            if (*strp) {
-+                asprintf(&old, "%s", *strp);
-+                free(*strp);
-+            }  else {
-+                asprintf(&old, "%s", "");
-+            }
-+            asprintf(strp, "%s%s:%s", old, subpath, value);
-+            free(value);
-+            free(old);
-+
-+            res++; /* At least one scalar was found */
-+        } else {
-+            /* It's an aggregate -- descend into it */
-+            res += cfg_as_string(child, subpath, strp);
-+        }
-+
-+        free(subpath);
-+    }
-+    return res;
-+}
-+
-+
- /* 0: success
-    <0: error */
- int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-@@ -1567,6 +1799,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-          sslhcfg_chroot = arg_strn("C", "chroot", "<path>", 0, 1, "Root to change to after set-up"),
-          sslhcfg_syslog_facility = arg_strn(NULL, "syslog-facility", "<str>", 0, 1, "Facility to syslog to"),
-          sslhcfg_on_timeout = arg_strn(NULL, "on-timeout", "<str>", 0, 1, "Target to connect to when timing out"),
-+         sslhcfg_prefix = arg_strn(NULL, "prefix", "<str>", 0, 1, "Reserved for testing"),
-  	sslhcfg_listen = arg_strn("p", "listen", "<host:port>", 0, 10, "Listen on host:port"),
-  	sslhcfg_ssh = arg_strn(NULL, "ssh", "<host:port>", 0, 10, "Set up ssh target"),
-  	sslhcfg_tls = arg_strn(NULL, "tls", "<host:port>", 0, 10, "Set up TLS/SSL target"),
-@@ -1592,14 +1825,14 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
- 
- 
-     config_init(&c);
--    if (sslhcfg_conffile->count) {
-+    if (sslhcfg_conffile && sslhcfg_conffile->count) {
-         if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
-             fprintf(stderr, "%s\n", errmsg);
-             return -1;
-         }
-     }
- 
--    s = config_lookup(&c, "/");
-+    s = config_root_setting(&c);
- 
-     res = read_block(s, cfg, table_sslhcfg, &errmsg);
-     if (!res) {
-@@ -1613,6 +1846,11 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
-         return -1;
-     }
- 
-+    errmsg = NULL;
-+    res = cfg_as_string(s, "", &errmsg);
-+    if (res)
-+        fprintf(stderr, "Unknown settings:\n%s\n", errmsg);
-+
-     return 0;
- }
- 
-@@ -1645,12 +1883,18 @@ static void sslhcfg_protocols_fprint(
-             fprintf(out, " <unset>");
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_protocols->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "fork: %d", sslhcfg_protocols->fork);
-         fprintf(out, "\n");
-         indent(out, depth);
-         fprintf(out, "tfo_ok: %d", sslhcfg_protocols->tfo_ok);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "transparent: %d", sslhcfg_protocols->transparent);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "log_level: %d", sslhcfg_protocols->log_level);
-         fprintf(out, "\n");
-         indent(out, depth);
-@@ -1694,6 +1938,9 @@ static void sslhcfg_listen_fprint(
-         fprintf(out, "port: %s", sslhcfg_listen->port);
-         fprintf(out, "\n");
-         indent(out, depth);
-+        fprintf(out, "is_udp: %d", sslhcfg_listen->is_udp);
-+        fprintf(out, "\n");
-+        indent(out, depth);
-         fprintf(out, "keepalive: %d", sslhcfg_listen->keepalive);
-         fprintf(out, "\n");
- }
-@@ -1743,6 +1990,9 @@ void sslhcfg_fprint(
-         indent(out, depth);
-         fprintf(out, "on_timeout: %s", sslhcfg->on_timeout);
-         fprintf(out, "\n");
-+        indent(out, depth);
-+        fprintf(out, "prefix: %s", sslhcfg->prefix);
-+        fprintf(out, "\n");
- 
-         indent(out, depth);
-         fprintf(out, "listen [%zu]:\n", sslhcfg->listen_len);
-diff --git a/sslh-conf.h b/sslh-conf.h
-index 9f48cf7..fbcc1c6 100644
---- a/sslh-conf.h
-+++ b/sslh-conf.h
-@@ -1,5 +1,5 @@
- /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
-- * on Wed Jul 29 22:51:16 2020. 
-+ * on Wed Jun 23 11:46:45 2021. 
- 
- # conf2struct: generate libconf parsers that read to structs
- # Copyright (C) 2018-2019  Yves Rutschle
-@@ -43,6 +43,7 @@
- struct sslhcfg_listen_item {
- 	char*	host;
- 	char*	port;
-+	int	is_udp;
- 	int	keepalive;
- };
- 
-@@ -52,8 +53,10 @@ struct sslhcfg_protocols_item {
- 	char*	port;
- 	int	service_is_present;
- 	char*	service;
-+	int	is_udp;
- 	int	fork;
- 	int	tfo_ok;
-+	int	transparent;
- 	int	log_level;
- 	int	keepalive;
- 	size_t	sni_hostnames_len;
-@@ -84,6 +87,7 @@ struct sslhcfg_item {
- 	char*	chroot;
- 	char*	syslog_facility;
- 	char*	on_timeout;
-+	char*	prefix;
- 	size_t	listen_len;
- 	struct sslhcfg_listen_item* listen;
- 	size_t	protocols_len;
-diff --git a/sslh-fork.c b/sslh-fork.c
diff --git a/srcpkgs/sslh/template b/srcpkgs/sslh/template
index c2862bf62014..55b6b53cee66 100644
--- a/srcpkgs/sslh/template
+++ b/srcpkgs/sslh/template
@@ -1,7 +1,7 @@
 # Template file for 'sslh'
 pkgname=sslh
 version=1.21c
-revision=2
+revision=1
 hostmakedepends="perl"
 makedepends="pcre-devel libconfig-devel libcap-devel"
 short_desc="Applicative Protocol Multiplexer"
diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 70f0c1cc44f6..ee52d60d001e 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,15 +1,20 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=1
+version=0.10.1a
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
- python3-aiohttp_socks python3-setproctitle python3-urwid python3-urwidtrees"
+makedepends="python3-devel"
+depends="python3 python3-aiohttp python3-blinker python3-natsort python3-urwid
+ python3-urwidtrees python3-xdg"
+pycompile_module="stig"
 short_desc="TUI and CLI for the BitTorrent client Transmission"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
-make_check=no # needs python3-asynctest which is not packaged
+checksum=7e0bd36b9fc4ba8c300dde8059b2516a75afc44fc5e0d30ba416a0d1535152c5
+
+post_extract() {
+	sed -i 's/urwidtrees>=1.0.3dev0/urwidtrees>=1.0.2/' setup.py
+}
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1408f4073099..117a1cc98219 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,7 +1,7 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.13
-revision=1
+version=5.12
+revision=2
 build_style=gnu-configure
 configure_args="--enable-silent-rules $(vopt_with libunwind)"
 makedepends="$(vopt_if libunwind libunwind-devel)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 build_options="static libunwind"
 build_options_default="libunwind"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 21dc3307c8b7..0fa557e120a4 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
-version=4.4.142
+version=4.4.137
 revision=1
 _singleapplication_hash=4aeac8fa3e7e96385ba556346ebb6020e35ffdd8
 _libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
@@ -19,11 +19,11 @@ distfiles="https://github.com/Stremio/stremio-shell/archive/v${version}.tar.gz
  https://github.com/Ivshti/libmpv/archive/${_libmpv_hash}.tar.gz
  https://dl.strem.io/four/v${version}/server.js
  https://dl.strem.io/four/v${version}/stremio.asar"
-checksum="3ffb70522f5f1f77516cd01ab27550a69f79d7256e492f6afec84e827067efab
+checksum="094c8e1afcb59bd67606d51b0088d7b1c85a6a9c22add08c3152abd5ff74f385
  b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
  e0545772ca819236926eb118c2f211f05e01f510c1c1a89758895919ed5718d4
- 618783dd211b2e03501c63f9008f56887514eb12e44de140a9822e5ac22c612b
- 8bdde1e95f75592001930e9b263d7ef6b9cdcacecc4635c53285af026f2b1f8c"
+ 7a722fc1315f03f43179070f0ad5a63e4f4b99b677537b72e92c15a5b277f988
+ c3f86982bff1e359be8c815adf1728fa6b12adb0194fcec68dd774227bf21db5"
 skip_extraction="server.js stremio.asar"
 
 post_extract() {
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 6ce5d88bafd2..0d4f3b18bcce 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.00
+version=0.12.12
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=1cefe4a3057c1522b146e62f61b80ce6e2e99da2d85ebe25bc03fc45228e58cd
+checksum=f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index fadb4a57a37e..d730ab75c608 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2059
+version=2056
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=eef0cd29290371d06afa400335d37fb6a6f30b1888fb53a017b248c4b43e6e83
+checksum=29844c7305b7f192b8b0bea6a32eebb80e7317f00ff9c39b4bfdab4982108720
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree
diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index b615e585077b..38acb380fec7 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=eea989068102c2fb536fb3a0e1daff205c3d0317bfc6b016658fc5059c7ff102
+checksum=aa63ba294f982a3c1f1ccd8b9f6601101a4940f49af91285fc57d01315b9239e
diff --git a/srcpkgs/swaybg/template b/srcpkgs/swaybg/template
index d7d2d92e609f..05fbe2b42f21 100644
--- a/srcpkgs/swaybg/template
+++ b/srcpkgs/swaybg/template
@@ -1,6 +1,6 @@
 # Template file for 'swaybg'
 pkgname=swaybg
-version=1.1
+version=1.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc git"
@@ -9,8 +9,8 @@ short_desc="Wallpaper tool for Wayland compositors"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaybg/archive/v${version}.tar.gz"
-checksum=958f425310514ae2aae064595c3e7efba2187b0d2947136c49188558fdb367b1
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
+checksum=a23f1cde07138b865630172eff83db916d2f0989b75fb318def85dcfc3120fbd
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 7933f31a4358..e6286f96998b 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.40.0
+version=1.38.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=0fbd3c99e9b5b4a34ff3bc56ddb7543dee036b22da464303cc6ba7ef91600818
+checksum=229ef51c0adcdf11a42e1b8d0ce0a6dda73b338970aa54db30ee5469d043f97b
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9cbb2273b8a5..e8041622c0ea 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.1
+version=1.18.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=808a373c3fed3eae7631bbf1edbced14abb050240b1a0ff6caff0980af7f0f01
+checksum=f3f102d3c0448baf762c814d2952eec90dc56347f87e27346ecd36a5e2c9515d
 
 pre_build() {
 	GOARCH= go generate \
diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 89799db1f733..77f5a521da2c 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=b037497b677684751162856808b05dc6eec67c8378cbabba16ecb74d7fff1b16
+checksum=2cf3e9f67bce39fdbfd915d5ab3942e62671d424d5bf997e4688cf56ee2e4454
 
 syndication-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index 2c9892a79b77..87907bbcda50 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/lib/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8a8cf63a59f7fea4c760256ef0e62444ec82521cc9120cd79142d8b4b5b0c9e2
+checksum=aafb3a7be2438ce6e229674f134a739f57ae0a26e98f628f33ae6731536c64d5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"
diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch
new file mode 100644
index 000000000000..4d99d6bc3f32
--- /dev/null
+++ b/srcpkgs/sysprof/patches/build.patch
@@ -0,0 +1,10 @@
+--- a/src/libsysprof-capture/sysprof-capture-condition.c
++++ b/src/libsysprof-capture/sysprof-capture-condition.c
+@@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self)
+     }
+ 
+   sysprof_assert_not_reached ();
++  return NULL;
+ }
+ 
+ static void
diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch
new file mode 100644
index 000000000000..abaac692fb37
--- /dev/null
+++ b/srcpkgs/sysprof/patches/musl.patch
@@ -0,0 +1,157 @@
+From 1d2de32e97bf5569cc33ee9a90c873e1bbd2b1e6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sun, 6 Sep 2020 18:21:37 +0200
+Subject: [PATCH] fix build on musl
+
+---
+ .../sysprof-capture-cursor.c                  |  1 +
+ .../sysprof-capture-reader.c                  |  1 +
+ src/libsysprof-capture/sysprof-capture-util.c |  1 +
+ .../sysprof-capture-writer-cat.c              |  1 +
+ src/libsysprof-capture/sysprof-collector.c    |  1 +
+ src/libsysprof-capture/sysprof-compat.h       | 28 +++++++++++++++++++
+ src/libsysprof-capture/sysprof-platform.c     |  1 +
+ 7 files changed, 34 insertions(+)
+ create mode 100644 src/libsysprof-capture/sysprof-compat.h
+
+diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c
+index 24563f0..bb77a60 100644
+--- a/src/libsysprof-capture/sysprof-capture-cursor.c
++++ b/src/libsysprof-capture/sysprof-capture-cursor.c
+@@ -59,6 +59,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-condition.h"
+ #include "sysprof-capture-cursor.h"
+ #include "sysprof-capture-reader.h"
+diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c
+index 67c6b28..252d006 100644
+--- a/src/libsysprof-capture/sysprof-capture-reader.c
++++ b/src/libsysprof-capture/sysprof-capture-reader.c
+@@ -68,6 +68,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-reader.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-capture-writer.h"
+diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c
+index 0bbea06..0e5f7e7 100644
+--- a/src/libsysprof-capture/sysprof-capture-util.c
++++ b/src/libsysprof-capture/sysprof-capture-util.c
+@@ -56,6 +56,7 @@
+ 
+ #include "config.h"
+ 
++#include <stdint.h>
+ #include <assert.h>
+ #include <errno.h>
+ #include <unistd.h>
+diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c
+index 66171b9..9febbbb 100644
+--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c
++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c
+@@ -63,6 +63,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture.h"
+ #include "sysprof-macros-internal.h"
+ 
+diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c
+index 1d7a0d6..7af6c96 100644
+--- a/src/libsysprof-capture/sysprof-collector.c
++++ b/src/libsysprof-capture/sysprof-collector.c
+@@ -73,6 +73,7 @@
+ 
+ #include "mapped-ring-buffer.h"
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-collector.h"
+ #include "sysprof-macros-internal.h"
+diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/sysprof-compat.h
+new file mode 100644
+index 0000000..ae9bf10
+--- /dev/null
++++ b/src/libsysprof-capture/sysprof-compat.h
+@@ -0,0 +1,28 @@
++/* added by q66 @ void to fix build on musl */
++
++#pragma once
++
++#ifndef __GLIBC__
++
++#include <stdlib.h>
++#include <errno.h>
++
++/* from glibc */
++#ifndef TEMP_FAILURE_RETRY
++# define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
++
++static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
++    if (sz && (nmemb > ((size_t)-1 / sz))) {
++        errno = ENOMEM;
++        return NULL;
++    }
++    return realloc(p, nmemb * sz);
++}
++
++#endif
+diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c
+index a80ab89..05bd590 100644
+--- a/src/libsysprof-capture/sysprof-platform.c
++++ b/src/libsysprof-capture/sysprof-platform.c
+@@ -60,6 +60,7 @@
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
++#include "sysprof-compat.h"
+ #include "sysprof-capture-util-private.h"
+ #include "sysprof-platform.h"
+ 
+-- 
+2.28.0
+
+From here onward, blame sgn
+Index: meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL
+ config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
+ 
+ config_h.set('HAVE_STRLCPY', cc.has_function('strlcpy'))
++config_h.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray'))
+ 
+ if get_option('libunwind')
+   libunwind_dep = dependency('libunwind-generic', required: false)
+Index: src/libsysprof-capture/sysprof-compat.h
+===================================================================
+--- a/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:39:58.352258624 +0100
++++ b/src/libsysprof-capture/sysprof-compat.h	2021-02-05 23:47:07.662841454 +0100
+@@ -17,6 +17,7 @@
+        __result; }))
+ #endif
+ 
++#ifndef HAVE_REALLOCARRAY
+ static inline void *reallocarray(void *p, size_t nmemb, size_t sz) {
+     if (sz && (nmemb > ((size_t)-1 / sz))) {
+         errno = ENOMEM;
+@@ -24,5 +25,5 @@
+     }
+     return realloc(p, nmemb * sz);
+ }
+-
++#endif
+ #endif
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 2e24cd7de548..eae51ea7356b 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,23 +1,27 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-version=3.40.1
+version=3.38.0
 revision=1
 build_style=meson
 configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme"
 hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel json-glib-devel"
+makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/sysprof"
+homepage="http://sysprof.com/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c25000d6a20e8c4d314f5c861a1f70d7c3e2027117437fd9198fa811b9fc7437
+checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit-devel"
 fi
 
+pre_build() {
+	export SHELL=/bin/bash
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/deleteme
 }
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 28975e3f28d1..3bbaac521054 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=10ed28d66aa7419210013f8a71cf43acdf82155cc47f6a1c9caa41a37480e2aa
+checksum=7817cbfd957221d1d638c087d60f93a93db6000cbe7240fd85885b32774ae941
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 9e99e7feb0d2..5c7710874355 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.4.3
+version=3.4.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c8746e8d9cae0c5390d03a72684b1b4d985f1d91b02ab59b75fa050231fe2677
+checksum=4d3218531fae449ffa76098fbe9a4693e43f2f93d0d38bb4163d6a9ce864d6c7
 
 build_options="qt webengine webkit script"
 build_options_default="qt"
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index bc7d37bdd1eb..74f1aeeb429f 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.1.0
+version=10.0.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=3035e311649061b57b2cde4e9625a062cee65832521ce57c039ed1f1676e4d25
+checksum=39a937767383d982a354b80b786c89b2c6fc7abbbf9d20b1bbe45918cef931e8
 
 tagparser-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index e715ba313352..598429ea085e 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.12.1
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -14,7 +14,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=9a94e6073f5e171c9ba6c3f5ca291bdae688c8e26fb586c3df4302204af77e86
+checksum=8345fc01fd07d3fa325817104b373bbdd54568ef807135e9d5eafa5321fa7f87
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 5f9cb1e03956..043842eb63c8 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.7.1
-revision=2
+revision=1
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 3b5cd9fcdadf..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.9.0
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=e908b8f479cf1f41892848f3cda1a7b46fca2339ce8980268dd204ff7ba8b6f5
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index e076fa74c5e9..0e292cb03ed0 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.0.4
+version=1.0.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=71a9d9e4a5d3ccfc6c41710a48870259ac977a2080f4d734a4b8fb8dc18728b6
+checksum=0b746b3464aeee13bfca8872123574be56309207920347b6e00f665ff4c8b402
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 672bc4f1e49b..9ebaa2fc426d 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.31.4
+version=0.31.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8d1cbdaf4f6a985cc9a2bd98dee50823bd102286e604022f7746ca0bb27f0e21
+checksum=127490a12f542089adcc4e8a609eae5042d25b25b1271405132189253fc73685
 
 post_install() {
 	vlicense LICENSE.txt
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=4
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 06e527a5258d..253dd32a4110 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20200406
-revision=10
+revision=9
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 9d7b80cd5418..95396e46d25e 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.20210627
-revision=2
+revision=1
 _commit=91d836dc84a16584c6ac52b36c04c0de504d9c34
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 3558008383b2..29704030c8d5 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=1
+version=3.30
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=dd2e7bc94e9453beabbafc10c4d62c67601ea705250103a67ababcdad2991dd3
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
@@ -20,10 +20,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) make_check=no ;;
 esac
 
-pre_check() {
+do_check() {
 	# on python3 mock is unittest.mock
 	sed -i 's|from mock|from unittest.mock|g' tests/**.py
 	sed -i 's|from mock|from unittest.mock|g' tests/**/*.py
+
+	python3 -m pytest
 }
 
 post_install() {
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 75a7fc0ce87d..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.6
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=80c92902a89b72a9df85c51a8b5fc472cc01b4410600ef1f56d62c4ac23890c1
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index ceea8393613f..70818293a92a 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.85.0
+version=5.84.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=431b4a480d200bf12e88ce510efd56edb062eb2284d4233f9602ae62a75da555
+checksum=e294e61d72dd0fc678c655475694fc1df3d703e04b043ae0a8666ed9399ebd42
 
 threadweaver-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 3a27d46b40b5..3a31df4b08f4 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.13.0
+version=78.12.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7bda27a111dace0450b17fc31d49c945fbe198a9b3e6039a80c17928cb353c4d
- 322c9130002ac74e6d95fee19863efab5dbbcd874a427ee9718e6ce084d92b99
- 56704bc9e98aa9dcee9c51be9e66abbc10f685588fe8375b6daaa806243af37d
- 944da0f8d06a8bad22f8799520cfef41c89403f2f9221f6ad2218d15a430bd7f
- 2ba409560ccc17acfbf6e13ca74700c999572b528f7c6e90468922d85b4321b0
- ff435d0ec657d00087c915a065f361fdb0bfc4ea68fe552ec02add734fe60331
- eeede691c6900f5dcb2ebb2661b04cdcd29e156b21c7da29803dd9451c3ac17d
- e93bc8dc1749b652f69064c1b26e4783a1277a26e173e6e1c16876912ead87ef
- b6020f9ac0176da7cc425b8a3bd91cf4ff970479d1de5c9aeeeb7f4d6512924f
- a6eb38aff29f132f419df1d834d55c386a506458219e96173919800a10035b17
- a08ca7eb8bd38c3b7b21c9560788359e736bbd6def25c96c61e5869eda39b8ce
- 03b0846d56d07f2419ae86cfcb3865f89709f0c811bd82f7bc0f766165a06b5c
- abac2f3a05484ae7a23353793104cd4832979ab298a53f53bd287e7f02b32405
- 7094ad93f495776ab4a0e7c5009b280a18d233e362adecd3d1f4e9db237a37dd
- bdeb359f37959a5b72682a08b9aa1102863ce3a4bfc4f31bcfad046a0af1033a
- 3726cc2c21f4d1caf570334a684e7918fae2d4df68f6f28bfe86d0e86346457e
- b7a1c55f098bf779ed944b244ffe76adfc69509ea456199eaeb445376c3fd715
- b5eec5c888340f6f7084024420829c525648861758ef8fa4efc1ea2023c3c1ca
- 036c4540944b0eca163c88ef36e894a5615a668ea094d8e33608be05e77243a7
- 0b66e7669e2069022073083fe921b8bfdc1cada02ec3fe7b5890c72663a3b5d2
- b15e81462c880b0e07c8787725852a0731e2b94904589d8b52ee7fcba0687a93
- 29b2f240fc186f44273cdc0f9cd5d74c84da739f10db43b715f25555df78b240
- f98796d091ece16a6818083510c435c2fc83e7e9d53ef0312d82489ff6cd2db4
- 070766bd8e62fb1b9d0ed09a1cbc2ee934aff4260bc2f8970b9f25c2daf63b00
- 3ccf7a716bf7618b056885771af6a4c746f57d6303e67f7db01162f7be9a677c
- 075beb7c0c1c7f5c90eff2a82b9c15eefd76df6f142e4da3b917833bf2ea4b0f
- def27717b72ec46f4074d89e6f8b7380507a2466281beb1303d650b8de3fedc2
- a2ed369cdcdbb49aed4920045b812d9bfe23a5d92093424b7fbfac8013a9e992
- 35b0e3bf7054af1a6dc3e7a0c78c3e15336a3fc07d20e58b7ae53ec0e9d6d42b
- c5fcecb851b10760f278cf3c935ee5e82215a7db6a210338c4d19ccb5ccd37df
- 3b3b8ec4606e357da724d622747bfa5af2b1623e7138f8aef388f1912d709235
- f14527396595af579528701f373222d5cec14cfba03defcd4dffce0bf535eab1
- a1c612e1bc18251039c7cc0efd69fb13928b5a1c3e1c867bc7f746232b41d63e
- d6a465fde49940d21c8b5b8972f3a69435be7f72093e72b01b9117ec3d037d6e
- e4d4b5d4052f218926ab4bda24d0d9ee2b293a910ea88596bc1e8fdc9b981e7c
- ac656bf61a3e5bd7bbedd61e5c11d644c5f4c20c3837b085c1f5ba84440cbe1f
- a3a7e72d9260d3b03dcd499f3b94d1cce351bf3e599de654e839b42f394e9e39
- df75e128c5596bd7d4cdce6e26fe83dc6e5be878f577627a3c6c7ac216f52830
- 0796b36090b7d0f64aabd6fdd1167442d6c8e93efda86813c68438663838dee9
- 70675c8c5dcb68f469eaba671f59165d538bbd3ace0ac1758035c36140945f99
- c38c907b3e872816ebb8173843b30794326344c2ce909b2c65576dac9bc0ac7f
- 249719bc75177e4865e49944df0dd1be117e06bb34a62e193bfc0bb3742bd0d4
- 1e759bf00cacfcf4bf2c43a17e175e520c13c96e8cf24c4ca15dd75318183c39
- bcabf64b27667b6587763144910e39fcc3d442f5de704ad08c456a5f1c60e02a
- 24ffbbe40330678280f85583219d859030288f1a86357e655efc4880dd3fbc6c
- d7ddb76db0e4c95c7012a6889ff59889e72d4170fafc3963cf80865f38232ac8
- 17285c5622c62fac2c4158a7bb0c8ec51d008c954e709a08c1066610ad61699e
- 1f39db4be0e581d647afdd4eae7ea1acd35e17479644bb5cf9bb4b7f6fa1c1e6
- 3901eef44cac5498aaae69468ed60619a1f7a7f61760f2145b6a38c2118c12fd
- 6c02e1e11e2571bd7bf0c7c7ce04add9b2f8bcca99f13cb5929046dc8d9758d9
- d1164a3c9c270ad73bc66bd7fee7e63efe6928c60bcfd5cf8116603211d7ca83
- f2a295ef52fde10e18fde500904640088d3568289c83534ed466cf84ed533386
- 1eccd599819a2b425b88939327a758c82118fa6710e0879fd27c4b86b48eaed3
- d4744a129b6ef34fcce7d0b9564a7543ce6be0dd471123c7e9814b36369aaf47
- a7d21c73056c48d2059c9543b11da192dc90d2024915b320b506651557d3f5c7"
+checksum="cafdbb0968a3b466a978fcb2faa9c6a764c8677c7e241d951797c74bd9928188
+ ad0d1c7cf54cc06d993c4fdacc1f8f3a47311c8fa2e8e4097189b1164aeaad17
+ 3a4abf71c7f4a27418dc1e1529300543a7638d651b12b27333e2b18cb02ac5f3
+ 873a08a0b69d048f139fff475f10349829898f780a0279a0181649a84d1fdc1f
+ 8614d95569ffb47fc92a361afd1ff85863dac10efa97c26edaf68a975186e280
+ 70ca45436d2a8085dddb66da51e729607a3c0934b95c6a47b2e7822038b9f65a
+ cd2f110bb4463b2a367aa8ac84624ee24b0bff9462179f02746aa5bc5e4101c1
+ 3f27e19bc6f2556951c77123d84b9a6b97959d3b21d88c7b6a1516deb12a02bc
+ e5237d6c497d47c6aced6beecd128ba37d365642006b1455d29c5d83148b6da1
+ a5a1614a20956f5e867d9540818e112bfec9ea9878c6a4e42c09e550baf72858
+ 233ed191ed22eea291b7b43be80e3f208ae7d5c9b3b9807bae580516d4a700b5
+ b5dfe4797783edda6393765d1dd56e4e1364f0e235e649a285202fc801516819
+ 7b08a16e2d8d60cd74528b2f6d1d4f3de720e1aedae03723feb9287b9e27f067
+ 242b0d20e9c35c44925169a71e46fe10a7975640223c693d6570c03a6c202fe3
+ 2dc6f17debc5d33f24fbabfbe004b6a94fee9bb91825c2c2b227ad71016f5991
+ 6a2e684e8556233e66ba6c7676c5973bf5092a8cdaabcd6c70c64505e26a91e3
+ a4789a21ce6cfbe470d828cfcfed94202ddab5a7d14f1c99432c535b11a975bf
+ 591c5d52655ad99aa989610c88ed6b2ecdfa65db71935b32f9113f58b53be227
+ 3c7ee73bd972fe36c077d806f136a92ae25ac88f99bcd5c9340a487b058d1cee
+ 6474c7bfe01f2bc873934f248b5b54934446d55cbbe454fd6036c76bbfba2a3b
+ 94635d3fa1e732317cc67973dcda0e3256172a1f1d167ad32df07a0f38d9dc3e
+ fc66e844883308e2a7649e1d1af9e7feaeab03d748cd12397fe8e424c8b9c1d3
+ 14f9935e87348519d74ff4dba9162162718374c6ae8e9efc415735b732025c88
+ 11e95579b67893c411b8dd167624df97968cc02c7d5d9343a89c348e7d191a73
+ a4d42770bf49890600f4311f47f08fb2f3f6808cf471af3c97498665591357ce
+ ee906a3b103b153a7a059d788e79a9f2f271958ba1a7ec887c7163f46ab7d5e0
+ 0cacd4402e8e45940d790acefb7ad75e57934eeb3317bd59429f0a80d3bd5724
+ a3c3b78cc9683f08ed7b05556da692b059f905a1c0e8461abec154a0b8bae43d
+ ec802e03918d49bf00a2e143f3cb58e717e31628a0efcd9d3a33d82694358e71
+ 8808342e19c7a6486d48cd777a77f95aec71357597f1743ee24bb3ea22234ec2
+ be6a4fdb3213bc2ef808b7cb15ad6ddb5861e7c0af0921f0e455e5558f036873
+ b0516415fc988199da774866c37fece1251be29eaf62375bf977ac91573ba354
+ c5691185768f84bb6bcbca3c772bb5fda8bebb02feb9c58e185652d52ed1e1b0
+ 8102e345825e8faa322e0883f2fcc765f9009c95ee7f82175c30ffa818a1e7ac
+ a82abf59f6b80ed7c38aefd094fd667017e3c5bfe2759005206dcfbda79fed5e
+ a156d2bb902771a852ec5258d547d7306026afa9318cb9e2686bf944b1900eb4
+ 8a6efc95689723aa8e3df6be4a49f8ac38a842567520e33a05a0cdca5996ee53
+ 4215b691b46f9af0b35255309cb062ae960e1094663a27cb485c33a904f701d9
+ b8951f19f09a3f30d6f181f6ad564852fea959e9c856c9bb4c1cfafd7cf85cad
+ ef763c002d1f9642fb46e8f984c6ec2a438ede66f704567a4de668efa7e6a560
+ 0b675f20a4aeeaebd60236de5ed9a0e0b93f6c91bb88d91e98c5a0533ca3adb6
+ 8396cf7a6aeb14ef4a4a6e6d9880796deedcec69436eb53f1cf4bf5ecee36d2f
+ 29b88e144cb1643d83ae3d81822c58633e127c283ba66a5a8eed5f8e6b2949fb
+ d96456875a81f7e13a27876aa5fc1460fd4356a3914a16b956a0c8cf4ccd7e65
+ 93e01c5a2c42fa88e4c6a348578d26e49b0e31c95d08187007957f13eb0a081a
+ 96b7e63036c9596b12f4ebb7d18fa867757278e391f0f3b495dff8c32e272670
+ cb9088735f3954cd68cf5041435a8e34b53fd1e8483837e802ac43afae8b5321
+ 30dbd9527e2fbc9d01420a364d10fbb49bf5ca3f39f31190e64e7ffffc073802
+ 1a772c4ec44bdaa668bb573c3733df878a5c3e7cdf857da4fc3ef06b0f94b189
+ 1fa8ddbbfc81122d450c99fda5502ba6166a8d7a91f3d0df3e6e280ae9fa0587
+ 55f540ef5d32129a12f08f105d2e8932db9e6a04351b524e3dff51e6859e6e5b
+ 3da17cc2da5919debf5eeec80e3cd7dd9f94317fb7e5ae242deed2c7e620f0e7
+ 981e542dc8e0781f6642eb67b534dcefc50b0683245e777da2c90209ac5bceba
+ 17f1b6ee14011ee84a7b3e3389e78a1b8835193da5228e25e0f5109284f8f074
+ 62309bf09f3a5a655c5dca236d5694157a28399733968afd608c4cafff4ba022"
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index b6192f7bf02c..876d9aeec6d8 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.13.0
+version=78.12.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=b7e4076e5ce561b06ad9cd89005989ed71fd724ce83c4888cf569dc2930d90e9
+checksum=e2a214cf6b056fb5fde9bcaf9aee9a619bab337f163d99b1cc216d1c44d6f200
 
 lib32disabled=yes
 
diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template
index da7e7f4fdcbb..285e2419fccf 100644
--- a/srcpkgs/tickr/template
+++ b/srcpkgs/tickr/template
@@ -1,6 +1,6 @@
 # Template file for 'tickr'
 pkgname=tickr
-version=0.7.1
+version=0.7.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.open-tickr.net/"
 distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
-checksum=391529a115b820d5c2cac7b466facc4722b7f90e02ab0acd7350a8e97adcee58
+checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
diff --git a/srcpkgs/timeshift/patches/d437358a.patch b/srcpkgs/timeshift/patches/d437358a.patch
deleted file mode 100644
index edc82d772a75..000000000000
--- a/srcpkgs/timeshift/patches/d437358a.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d437358ac3debf7625aefda4d0bd387a91b69df5
-Author: Tony George <teejeetech@gmail.com>
-Date:   Sun Jun 6 12:04:07 2021 +0530
-
-    Fix for #425, #753, #755
-
-diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala
-index 18f09de..b276055 100755
---- a/src/Utility/Device.vala
-+++ b/src/Utility/Device.vala
-@@ -428,10 +428,10 @@ public class Device : GLib.Object{
- 
- 			try{
- 				if (lsblk_is_ancient){
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
- 				}
- 				else{
--					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
-+					rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
- 				}
- 
- 				if (rex.match (line, 0, out match)){
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 6977a413e750..ebdbb9ee28be 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -1,7 +1,7 @@
 # Template file for 'timeshift'
 pkgname=timeshift
 version=20.11.1
-revision=2
+revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext pkg-config vala which"
 makedepends="libgee08-devel json-glib-devel gtk+3-devel vte3-devel libgirepository-devel"
diff --git a/srcpkgs/tootle/template b/srcpkgs/tootle/template
deleted file mode 100644
index 20eb85e27a6e..000000000000
--- a/srcpkgs/tootle/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'tootle'
-pkgname=tootle
-version=1.0
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config gettext glib-devel"
-makedepends="vala libhandy1-devel libsoup-devel libgee08-devel json-glib-devel"
-short_desc="Native GTK Mastodon client"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/bleakgrey/tootle/"
-distfiles="https://github.com/bleakgrey/tootle/archive/$version.tar.gz"
-checksum=e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496
diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8985c36cd540..2a5430d43ec7 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.1
+version=3.24.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880
+checksum=67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 77802c21ea8f..600d144218c5 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=1
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..810675677fe5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 9d266c66397f..6ea8e49a1a51 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=1
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index 12ba53374733..b83fe8746262 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=2
+revision=1
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/ugdb/patches/atomicu64.patch b/srcpkgs/ugdb/patches/atomicu64.patch
deleted file mode 100644
index ec56043af570..000000000000
--- a/srcpkgs/ugdb/patches/atomicu64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit db6e990cc46d69526beae930e0048f65d5510c34
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 10 18:52:51 2021 +0200
-
-    fix build on platforms without 64-bit atomics
-
-diff --git a/src/main.rs b/src/main.rs
-index ccfccab..fe2b52c 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -284,7 +284,7 @@ struct MpscTimer {
-     next_sender: Option<Sender<Event>>,
-     sender: Sender<Event>,
-     evt_fn: Box<dyn Fn() -> Event>,
--    counter: std::sync::Arc<std::sync::atomic::AtomicU64>,
-+    counter: std::sync::Arc<std::sync::atomic::AtomicUsize>,
- }
- 
- impl MpscTimer {
-@@ -293,7 +293,7 @@ impl MpscTimer {
-             next_sender: Some(sender.clone()),
-             sender,
-             evt_fn,
--            counter: std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0)),
-+            counter: std::sync::Arc::new(std::sync::atomic::AtomicUsize::new(0)),
-         }
-     }
- 
diff --git a/srcpkgs/ugdb/template b/srcpkgs/ugdb/template
index 20f7ed0f2096..2220ee92948b 100644
--- a/srcpkgs/ugdb/template
+++ b/srcpkgs/ugdb/template
@@ -1,15 +1,18 @@
 # Template file for 'ugdb'
 pkgname=ugdb
-version=0.1.10
+version=0.1.9
 revision=1
 build_style=cargo
-checkdepends="gdb"
 short_desc="Alternative TUI for gdb"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/ftilde/ugdb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ccc41aed24f3ed8fd18decbcbb12ffa78542b5de37692a6dc927c08e4eb234bb
+checksum=c96925da24fa684f6b22f1fee90a83d34c69be0466ae2fd7fa96cd5af7e903a1
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) broken="nix-0.7.0 fails to build";;
+esac
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d69dc5429c43..e84c3b45f5c5 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.3.7
+version=3.3.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=6125c19e33037714645a8d5a8700659d02e46a20c8e1f62c0a766d2a9bf0f93c
+checksum=a536375252af0fb82b296b238cc3e45851f526283a333ce41390500e03a42e24
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 9e0faecb59b3..50fa577ef7a8 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=8005661ae474d2fb205ee4eec5b496a363b8530ad5b005052d3694f58b189e5a
+checksum=1a51138f8987e1c23dea6954d0e1d2d42e2d2e7bed0e5bfec56524e0a8f181a4
 python_version=2
 
 pre_configure() {
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..8cad3cf76263 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=6
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 77204e7fcd75..a992aa09bb97 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
-version=1.13.2
-revision=1
+version=1.13.1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://nlnetlabs.nl/projects/unbound/about/"
 distfiles="https://nlnetlabs.nl/downloads/unbound/${pkgname}-${version}.tar.gz"
-checksum=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+checksum=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
 system_accounts="_unbound"
 
 post_install() {
diff --git a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch b/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
deleted file mode 100644
index facf97c6674e..000000000000
--- a/srcpkgs/util-linux/patches/0001-lib-pwdutils-don-t-use-getlogin-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3386b92e09e8a945cb071808e012e0b600f8bcb2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Tue, 27 Jul 2021 23:41:30 -0300
-Subject: [PATCH 1/4] lib/pwdutils: don't use getlogin(3).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Per the man page, it shouldn't be used for security purposes. This is an
-issue especially on musl, where getlogin is implemented as
-getenv("LOGNAME"). Since xgetlogin is being used as user identity in su(1), to
-set PAM_RUSER, we simply switch to always using getpwuid(getuid()).
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- lib/pwdutils.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/lib/pwdutils.c b/lib/pwdutils.c
-index d97020cb9..641a9da40 100644
---- a/lib/pwdutils.c
-+++ b/lib/pwdutils.c
-@@ -104,11 +104,6 @@ char *xgetlogin(void)
- {
- 	struct passwd *pw = NULL;
- 	uid_t ruid;
--	char *user;
--
--	user = getlogin();
--	if (user)
--		return xstrdup(user);
- 
- 	/* GNU Hurd implementation has an extension where a process can exist in a
- 	 * non-conforming environment, and thus be outside the realms of POSIX
-@@ -117,6 +112,9 @@ char *xgetlogin(void)
- 	 * environment.
- 	 *
- 	 * http://austingroupbugs.net/view.php?id=511
-+	 *
-+	 * The same implementation is useful for other systems, since getlogin(3)
-+	 * shouldn't be used as actual identification.
- 	 */
- 	errno = 0;
- 	ruid = getuid();
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch b/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
deleted file mode 100644
index d9dba317a592..000000000000
--- a/srcpkgs/util-linux/patches/0001-sulogin-fix-getpasswd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c466f7c353beb3076a2be8fb2931b9951430128 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 29 Jul 2021 21:28:00 +0200
-Subject: [PATCH 1/6] sulogin: fix getpasswd()
-
-Fixes: https://github.com/karelzak/util-linux/issues/1400
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/sulogin.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
-index 3016ef483..4d48943ad 100644
---- a/login-utils/sulogin.c
-+++ b/login-utils/sulogin.c
-@@ -621,6 +621,7 @@ static char *getpasswd(struct console *con)
- 	cp = &con->cp;
- 	tty = con->tio;
- 
-+	ret = pass;
- 	tty.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
- 	tty.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP|ISIG);
- 	tc = (tcsetattr(fd, TCSAFLUSH, &tty) == 0);
--- 
-2.32.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 37fca0298c83..7094650c3202 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -2,7 +2,7 @@
 # Keep this package sync with util-linux-common
 pkgname=util-linux
 version=2.37.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 795ba64667be..870fe215fb92 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,13 +1,13 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
-version=0.48.3
+version=0.48.1
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
 short_desc="Code Intelligence for Vala & Genie"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-3.0-only"
 homepage="https://github.com/benwaffle/vala-language-server"
 distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
-checksum=1a752515efda561aec535d088a6f52888b13ad2d52f2d27770ddf6a519f0028b
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
deleted file mode 100644
index 84d126b4d87c..000000000000
--- a/srcpkgs/vala/patches/disable-unstable-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch disables tests that fail in github-ci, but pass on other linux systems.
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -706,9 +706,7 @@
- 	dbus/dynamic-method.test \
- 	dbus/enum-string-marshalling.vala \
- 	dbus/signals.test \
--	dbus/filedescriptor.test \
- 	dbus/filedescriptor-async.test \
--	dbus/filedescriptor-errors.test \
- 	dbus/dicts.test \
- 	dbus/bug596862.vala \
- 	dbus/bug602003.test \
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index a663467846fc..4250b7f044a1 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,34 +1,29 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=2
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config automake libtool"
+hostmakedepends="flex libxslt pkg-config"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 shlib_provides="libvalaccodegen.so"
-make_check=extended
-
-pre_configure() {
-	autoreconf -if
-}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
+	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
 }
 
 libvala_package() {
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index b94938be33ae..d2af2f9be152 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,6 +1,6 @@
 # Template file for 'valabind'
 pkgname=valabind
-version=1.8.0
+version=1.7.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radare.org/r/"
 distfiles="https://github.com/radare/valabind/archive/${version}.tar.gz"
-checksum=3eba8c36c923eda932a95b8d0c16b7b30e8cdda442252431990436519cf87cdd
+checksum=643c1ddc85e31de975df361a20e3f39d385f5ced0e50483c6e96b33bb3d32261
diff --git a/srcpkgs/valadoc/patches b/srcpkgs/valadoc/patches
deleted file mode 120000
index 11fa71e74306..000000000000
--- a/srcpkgs/valadoc/patches
+++ /dev/null
@@ -1 +0,0 @@
-../vala/patches
\ No newline at end of file
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index cb48ff44da84..4593b7db5f69 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,8 +1,8 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.52.4
-revision=1
+version=0.50.0
+revision=3
 wrksrc="vala-${version}"
 build_style=gnu-configure
 configure_args="--with-cgraph=yes"
@@ -13,9 +13,9 @@ short_desc="Vala Documentation Tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
-changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31
+checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
 
 pre_configure() {
 	autoreconf -if
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index dd9bd96aeb2a..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.4
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=eec79d6a08ae395016a0745b5aa2689daa9eac3c7c7f1528c0bc2bc9896d4ae7
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
deleted file mode 100644
index 6222e905d8c9..000000000000
--- a/srcpkgs/vault-acme/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'vault-acme'
-pkgname=vault-acme
-version=0.0.8
-revision=1
-build_style=go
-go_import_path=github.com/remilapeyre/vault-acme
-go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
-depends="vault"
-short_desc="ACME backend for Hashicorp Vault"
-maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/remilapeyre/vault-acme"
-distfiles="https://github.com/remilapeyre/vault-acme/archive/refs/tags/v$version.tar.gz"
-checksum=e09147df00109c68cc30e6943f50f2cad5a1b5be8b54ddc8cf007b5dea750ca4
-
-post_install() {
-	mv $DESTDIR/usr/bin/{acme,vault-acme}
-	mv $DESTDIR/usr/bin/{sidecar,vault-acme-sidecar}
-	vlicense LICENSE
-}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index a0d4649a461f..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.8.1
+version=1.6.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=4b0264f28defc05454c31277cfa6ff63695a458d
+_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=dbf389458fddeb5f8c567d00b6d17ce054f5b7667c226dbb598aa2c0f9048004
+checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0700 root root"
diff --git a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch b/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
deleted file mode 100644
index 4fc361225049..000000000000
--- a/srcpkgs/vc/patches/dea29a67bd5b7523da7678eb5b37f42c0e2759b7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dea29a67bd5b7523da7678eb5b37f42c0e2759b7 Mon Sep 17 00:00:00 2001
-From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
-Date: Fri, 25 Jun 2021 14:24:23 +0200
-Subject: [PATCH] support GCC standard libraries which do not define
- __GLIBC_PREREQ
-
----
- Vc/global.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Vc/global.h b/Vc/global.h
-index 6f85b3ce2..d19dc45c2 100644
---- a/Vc/global.h
-+++ b/Vc/global.h
-@@ -132,10 +132,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #endif
- 
- #ifdef Vc_GCC
--#  if Vc_GCC >= 0x70000 && defined __i386__ && (!defined __GLIBC_PREREQ || !__GLIBC_PREREQ(2,26))
-+#  if Vc_GCC >= 0x70000 && defined __i386__
-      // GCC 7 changed alignof(max_align_t) to 16. glibc 2.26 followed with malloc in 2.26.
-      // 1. If GCC >= 7 and libc is not glibc max_align_t and malloc mismatch
-      // 2. If GCC >= 7 and libc is glibc < 2.26 max_align_t and malloc mismatch
-+#    ifdef __GLIBC_PREREQ
-+#      if __GLIBC_PREREQ(2,26)
-+#        define Vc_HAVE_STD_MAX_ALIGN_T 1
-+#      endif
-+#    endif
- #  elif Vc_GCC >= 0x40900
- #    define Vc_HAVE_STD_MAX_ALIGN_T 1
- #  else
diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template
index 63a77967b37c..9b2a89373446 100644
--- a/srcpkgs/vc/template
+++ b/srcpkgs/vc/template
@@ -1,6 +1,6 @@
 # Template file for 'vc'
 pkgname=vc
-version=1.4.2
+version=1.4.1
 revision=1
 wrksrc="Vc-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/VcDevel/Vc"
 distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz"
-checksum=50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952
+checksum=68e609a735326dc3625e98bd85258e1329fb2a26ce17f32c432723b750a4119f
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index 7c8f8290598a..56049e393414 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.2
+version=8.11.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -43,7 +43,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="LGPL-2.1-or-later"
 homepage="https://libvips.github.io/libvips/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
+checksum=6351dfb99836274a0d74d8054506bf6dc9a8c38bacf208a9c566889dd1ebba0b
 python_version=3
 
 build_options="gir hdf5"
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index d283c39363bb..71ffd9876c09 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,7 +15,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
 VBOX_NO_LEGACY_XORG_X11 = 1
-PATH_SDK_QT5_INC := /usr/include/qt5
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d84944232a73..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.26
+version=6.1.20
 revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes
@@ -33,6 +33,7 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 426d29c7da33..00bc1873f996 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.16
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,8 +42,6 @@ makedepends="
  $(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
  $(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
 depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
-# test/run_vlc.sh fail on CI
-make_check=ci-skip
 
 # Package build options
 build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 73e735257f72..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,14 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.9.0
+version=0.8.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
 short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=2995653bc506e7af061bec88fdeee973f468c1599f82e2773c0e488a33bb101a
-make_check=no # no tests, but check fails with a non-zero return code
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index a6a4bb073dd2..b56c51aeb168 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..4b301e85c3d 100644
+index a6e043f122c..2c537818fca 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
  			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5abb59ec0b65..5bb43078fcea 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index ad0e4717a66..d3c34a95ec9 100644
+index a6e043f122c..276823dede9 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  				'resources/win32/code_150x150.png'
  			], { base: '.' }));
  		} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf..93298f56bec2 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 2d973599343..61acb0a4d10 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
+@@ -87,5 +87,3 @@ runtime "${runtime}"`;
  	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
  	yarnInstall(watchPath);
  }
 -
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 24e5aca3b26a..ade24d3a1088 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.59.0
+version=1.58.2
 revision=1
 _electronver=12.0.9
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
+checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 434e9f549584..945678b4a390 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.64.2
-revision=2
+revision=1
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 55a808ac5ec5..8bb9fde4f69a 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.1.3
+version=4.1.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=b0a6620e35b05455d3e91898fb34fed12e996f7b820b409a6733906045a958db
+checksum=0a732ddc5cada530c0b626d4dd5db88ba12f59173d52402ebc2f629e0a6108cf
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
deleted file mode 100644
index 27055015de3e..000000000000
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 1e7d7e7361189d40ace22d6ff2e2139a4e6759f0 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 31 Jul 2021 22:31:52 +0200
-Subject: [PATCH 2/2] some big endian rendering fixes
-
-Source: Jacek Piszczek <jacek.piszczek@runbox.com>
----
- .../platform/graphics/ImageBufferBackend.cpp  | 109 ++++++++++++++++++
- .../platform/graphics/ImageBufferBackend.h    |   3 +
- 2 files changed, 112 insertions(+)
-
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-index 9394e7bf..e704be6b 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.cpp
-@@ -110,7 +110,11 @@ Vector<uint8_t> ImageBufferBackend::toBGRAData(void* data) const
- 
- static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-     if (!alpha) {
-         reinterpret_cast<uint32_t*>(destPixel)[0] = 0;
-         return;
-@@ -121,21 +125,73 @@ static inline void copyPremultipliedToPremultiplied(PixelFormat srcPixelFormat,
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8)
-+    {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else
-+    {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * 255) / alpha;
-+            destPixel[2] = (srcPixel[2] * 255) / alpha;
-+            destPixel[3] = (srcPixel[3] * 255) / alpha;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * 255) / alpha;
-+        destPixel[1] = (srcPixel[1] * 255) / alpha;
-+        destPixel[2] = (srcPixel[2] * 255) / alpha;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * 255) / alpha;
-+        destPixel[1] = (srcPixel[2] * 255) / alpha;
-+        destPixel[2] = (srcPixel[3] * 255) / alpha;
-+        destPixel[3] = alpha;
-+    }
-+    else {
-+        destPixel[0] = alpha;
-+        destPixel[1] = (srcPixel[0] * 255) / alpha;
-+        destPixel[2] = (srcPixel[1] * 255) / alpha;
-+        destPixel[3] = (srcPixel[2] * 255) / alpha;
-+    }
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * 255) / alpha;
-         destPixel[1] = (srcPixel[1] * 255) / alpha;
-@@ -149,16 +205,51 @@ static inline void copyPremultipliedToUnpremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * 255) / alpha;
-     destPixel[2] = (srcPixel[0] * 255) / alpha;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
- {
-+#if CPU(BIG_ENDIAN)
-+    uint8_t alpha = srcPixel[srcPixelFormat == PixelFormat::ARGB8 ? 0 : 3];
-+#else
-     uint8_t alpha = srcPixel[3];
-+#endif
-+
-     if (!alpha || alpha == 255) {
-         copyPremultipliedToPremultiplied(srcPixelFormat, srcPixel, destPixelFormat, destPixel);
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    if (srcPixelFormat == destPixelFormat) {
-+        if (srcPixelFormat == PixelFormat::ARGB8) {
-+            destPixel[0] = alpha;
-+            destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+            destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+            destPixel[3] = (srcPixel[3] * alpha + 254) / 255;
-+            return;
-+        }
-+        destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    if (srcPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = (srcPixel[1] * alpha + 254) / 255;
-+        destPixel[1] = (srcPixel[2] * alpha + 254) / 255;
-+        destPixel[2] = (srcPixel[3] * alpha + 254) / 255;
-+        destPixel[3] = alpha;
-+        return;
-+    }
-+
-+    destPixel[0] = alpha;
-+    destPixel[1] = (srcPixel[0] * alpha + 254) / 255;
-+    destPixel[2] = (srcPixel[1] * alpha + 254) / 255;
-+    destPixel[3] = (srcPixel[2] * alpha + 254) / 255;
-+#else
-     if (srcPixelFormat == destPixelFormat) {
-         destPixel[0] = (srcPixel[0] * alpha + 254) / 255;
-         destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-@@ -172,6 +263,7 @@ static inline void copyUnpremultipliedToPremultiplied(PixelFormat srcPixelFormat
-     destPixel[1] = (srcPixel[1] * alpha + 254) / 255;
-     destPixel[2] = (srcPixel[0] * alpha + 254) / 255;
-     destPixel[3] = alpha;
-+#endif
- }
- 
- static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelFormat, const uint8_t* srcPixel, PixelFormat destPixelFormat, uint8_t* destPixel)
-@@ -181,11 +273,27 @@ static inline void copyUnpremultipliedToUnpremultiplied(PixelFormat srcPixelForm
-         return;
-     }
- 
-+#if CPU(BIG_ENDIAN)
-+    // Swap pixel channels ARGB <-> RGBA.
-+    if (destPixelFormat == PixelFormat::ARGB8) {
-+        destPixel[0] = srcPixel[3];
-+        destPixel[1] = srcPixel[0];
-+        destPixel[2] = srcPixel[1];
-+        destPixel[3] = srcPixel[2];
-+    }
-+    else {
-+        destPixel[0] = srcPixel[1];
-+        destPixel[1] = srcPixel[2];
-+        destPixel[2] = srcPixel[3];
-+        destPixel[3] = srcPixel[0];
-+    }
-+#else
-     // Swap pixel channels BGRA <-> RGBA.
-     destPixel[0] = srcPixel[2];
-     destPixel[1] = srcPixel[1];
-     destPixel[2] = srcPixel[0];
-     destPixel[3] = srcPixel[3];
-+#endif
- }
- 
- template<void (*copyFunctor)(PixelFormat, const uint8_t*, PixelFormat, uint8_t*)>
-@@ -207,6 +315,7 @@ void ImageBufferBackend::copyImagePixels(
-     AlphaPremultiplication destAlphaFormat, PixelFormat destPixelFormat, unsigned destBytesPerRow, uint8_t* destRows, const IntSize& size) const
- {
-     // We don't currently support getting or putting pixel data with deep color buffers.
-+    // BGRA8 is actually ARGB8 on BIG_ENDIAN.
-     ASSERT(srcPixelFormat == PixelFormat::RGBA8 || srcPixelFormat == PixelFormat::BGRA8);
-     ASSERT(destPixelFormat == PixelFormat::RGBA8 || destPixelFormat == PixelFormat::BGRA8);
- 
-diff --git a/Source/WebCore/platform/graphics/ImageBufferBackend.h b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-index 31ce9775..4c52fa52 100644
---- a/Source/WebCore/platform/graphics/ImageBufferBackend.h
-+++ b/Source/WebCore/platform/graphics/ImageBufferBackend.h
-@@ -58,6 +58,9 @@ enum class PreserveResolution : uint8_t {
- enum class PixelFormat : uint8_t {
-     RGBA8,
-     BGRA8,
-+#if CPU(BIG_ENDIAN)
-+    ARGB8 = BGRA8, // BGRA will actually be ARGB on BIG_ENDIAN
-+#endif
-     RGB10,
-     RGB10A8,
- };
--- 
-2.31.1
-
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index e11d62d50acf..12011525f3ed 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -211,51 +211,3 @@ index 6cd7126..24708f7 100644
  template<typename T>
  inline T flipBytesIfLittleEndian(T value, bool littleEndian)
  {
-diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-index 33be4058..1a6d69fd 100644
---- a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-+++ b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
-@@ -179,3 +179,9 @@
- #else
- #define OFFLINE_ASM_HAVE_FAST_TLS 0
- #endif
-+
-+#if CPU(BIG_ENDIAN)
-+#define OFFLINE_ASM_BIG_ENDIAN 1
-+#else
-+#define OFFLINE_ASM_BIG_ENDIAN 0
-+#endif
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-index 20c0c40b..10c58846 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1667,7 +1667,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
- 
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     loadi ArrayStorage::m_vector + TagOffset[t3, t1, 8], t2
-     loadi ArrayStorage::m_vector + PayloadOffset[t3, t1, 8], t1
-diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-index 27e76d2f..bfb2a46e 100644
---- a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
-@@ -1721,7 +1721,11 @@ llintOpWithMetadata(op_get_by_val, OpGetByVal, macro (size, get, dispatch, metad
-     
- .opGetByValNotDouble:
-     subi ArrayStorageShape, t2
--    bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    if BIG_ENDIAN
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValSlow
-+    else
-+        bia t2, SlowPutArrayStorageShape - ArrayStorageShape, .opGetByValNotIndexedStorage
-+    end
-     biaeq t1, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t3], .opGetByValSlow
-     get(m_dst, t0)
-     loadq ArrayStorage::m_vector[t3, t1, 8], t2
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 547847a65956..55087a491946 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.3
-revision=2
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -21,8 +21,7 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
 # Don't remove which from hostmakedepends
 # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
 hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl
- $(vopt_if wayland 'wayland-devel libxml2-devel')"
+ geoclue2 libharfbuzz which $(vopt_if wayland wayland-devel)"
 makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
  libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
@@ -30,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
  libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
  woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
  qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
- libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
+ libgcrypt-devel $(vopt_if x11 libXt-devel)
  $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
 short_desc="GTK+3 port of the WebKit2 browser engine"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 97b2c6254b24..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=21
-revision=5
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b9873e09451..675b1a3ab50e 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=6.3.0
+version=6.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0
+checksum=cd8d53513d8357b2876a66bab089654ef9941f42ef690fb555c6493f5381dbca
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3c79d36512d4..0fc85f2461f7 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- a/wine-6.15/dlls/dnsapi/libresolv.c
-+++ b/wine-6.15/dlls/dnsapi/libresolv.c
+--- a/wine-6.13/dlls/dnsapi/libresolv.c
++++ b/wine-6.13/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2e0376c44712..24d2505627d2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.15
+version=6.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
- 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61"
+checksum="e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+ 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4"
 
 build_options="mingw staging"
 build_options_default="mingw"
diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template
index d54f00def807..fdb9a6b2120e 100644
--- a/srcpkgs/wps-office/template
+++ b/srcpkgs/wps-office/template
@@ -1,20 +1,20 @@
 # Template file for 'wps-office'
 pkgname=wps-office
-version=11.1.0.10702
-revision=1
+version=11.1.0.10161
+revision=2
 archs="x86_64"
 create_wrksrc=yes
 makedepends="rpmextract"
 short_desc="Linux office suite with similar appearance to MS Office"
-maintainer="mobinmob <mobinmob@disroot.org>"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 # The old Kingsoft WPS Community License has disappeared from the
 # site. There is an EULA in the archive which is instaled as license
 # and a non-downloadable EULA which is accesible from inside the program:
-# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10702
+# https://www.wps.com/eula?distsrc=2021help&lang=en_US&version=11.1.0.10161
 license="custom:EULA"
 homepage="http://wps-community.org"
 changelog="http://linux.wps.com/wpslinuxlog.html"
-checksum=fc1c0ff0f9a9063f77999b1dbbdc1321f241d619f92af37e03ff9f2db3099225
+checksum=d8d16c3eea4bb902c12a79866072754ee460adba16fcc79a1f52eae011cf462d
 allow_unknown_shlibs=yes
 nodebug=yes
 restricted=yes
@@ -23,7 +23,7 @@ restricted=yes
 # The programs themselves are PIE, but the error reporter isn't :/
 nopie=yes
 
-_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10702
+_disturl=http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10161/
 _distTar="${pkgname}-${version}.XA-1.x86_64.rpm"
 distfiles="${_disturl}/${_distTar}"
 
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index e3f9f998152b..2b858bad487f 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,19 +1,18 @@
 # Template file for 'x265'
 pkgname=x265
-version=3.5
+version=3.4
 revision=1
-_commit="f0c1022b6be1"
+_commit="a4f320054d67"
 wrksrc="multicoreware-x265_git-${_commit}"
 build_wrksrc=source
 build_style=cmake
 configure_args="-DENABLE_PIC=1"
-hostmakedepends="git"
 short_desc="Open Source H.265/HEVC video encoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://x265.org/"
 distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
+checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
 
 build_options="altivec assembly"
 
@@ -30,11 +29,7 @@ esac
 
 if [ "$build_option_assembly" ]; then
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*)
-			# see https://bitbucket.org/multicoreware/x265_git/issues/559
-			configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
-			hostmakedepends+=" nasm"
-			;;
+		x86_64*|i686*) hostmakedepends+=" nasm" ;;
 		*) ;;
 	esac
 fi
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4e5bcc423bed..cc8ba08a4391 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.22.4
+version=5.22.3
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f5fc9eb06d63d7a4c057b2c6cb496c66e7491e5a4a4a0846a10c18be8ce1b4f6
+checksum=b8285db377708f90e8f9471d8cc2e4d3141248099e8af8a408498c7b37b7ecbd
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index b2c323f8c311..d4094a292126 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.1.3
-revision=4
+revision=3
 build_style=gnu-configure
 make_check_target=test
 hostmakedepends="xmlto lynx"
-depends="bash xset"
+depends="bash"
 short_desc="Tools to assist applications with various desktop integration tasks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
+#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
 distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
 
diff --git a/srcpkgs/xdotool/template b/srcpkgs/xdotool/template
index 2ba17de116f6..465e71fa29bd 100644
--- a/srcpkgs/xdotool/template
+++ b/srcpkgs/xdotool/template
@@ -1,6 +1,6 @@
 # Template file for 'xdotool'
 pkgname=xdotool
-version=3.20210804.2
+version=3.20160805.1
 revision=3
 build_style=gnu-makefile
 make_build_target="all"
@@ -12,7 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/jordansissel/xdotool"
 distfiles="https://github.com/jordansissel/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=fde6b15b5978c91e0ecb78cc541a9987752e724820722e479dcc2efc17466c89
+checksum=35be5ff6edf0c620a0e16f09ea5e101d5173280161772fca18657d83f20fcca8
+CFLAGS="-std=c99"
 
 xdotool-devel_package() {
 	short_desc+=" - development files"
@@ -20,7 +21,6 @@ xdotool-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
 	}
 }
 
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template
index 479f602b22f0..1ea4c63d37bc 100644
--- a/srcpkgs/xeyes/template
+++ b/srcpkgs/xeyes/template
@@ -1,16 +1,16 @@
 # Template file for 'xeyes'
 pkgname=xeyes
-version=1.2.0
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
-makedepends="libXmu-devel libXt-devel libXrender-devel libXi-devel"
+makedepends="libXmu-devel libXt-devel libXrender-devel"
 short_desc="Follow the mouse"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f8a17e23146bef1ab345a1e303c6749e42aaa7bcf4f25428afad41770721b6db
+checksum=57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 8c3d0d56f820..c8ec5bb1db53 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,22 +1,27 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=1
+version=19.1.0
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
- pixman-devel MesaLib-devel xorg-server-devel xorg-util-macros"
+makedepends="xorgproto eudev-libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1 mesa-dri"
 short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+checksum=4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d
 
 lib32disabled=yes
+CFLAGS="-fcommon"
 LDFLAGS="-Wl,-z,lazy"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv6*) broken="no dri.h";;
+esac
+
 post_install() {
 	vlicense COPYING
 }
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 2efa4c1f6a19..2ad44227da84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.1
+version=1.3.95
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -12,7 +12,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=37d0dc569e735e482a18545c24eb1ce0229d6910e3a4d4c1dee0680999234be2
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
+
+CFLAGS="-fcommon"
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..9ff8f43e7556 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=1
+version=0.37
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -13,9 +13,9 @@ makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
 short_desc="Minimalistic Text Based Status Bar"
 maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
-homepage="https://xmobar.org"
+homepage="http://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=e4b8b86ef9c47535a80d056a8b46d72748517f8d6dc891910eecdc388e92522e
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
 build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 761989ce69a7..800d5dccff7c 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.13
+version=1.20.12
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300
+checksum=336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index d776a8ac7114..d19653dfd55d 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.2.2
+version=4.2.1
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=e1928b5ac2d25c7cad8ad8965b507552097d45fea30b7d0e9f6eb14da4d78bac
+checksum=73ab56ac2c30884c54174e9fd1395cdf43f1a5f069aff3b322099ec84fbfd09b
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index a046b128e92e..b0e1ebe6cd22 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -1,16 +1,16 @@
-# Template file for 'xwd'
+# Template build file for 'xwd'.
 pkgname=xwd
-version=1.0.8
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libxkbfile-devel"
 short_desc="Dump an image of an X window"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
 homepage="http://xorg.freedesktop.org"
+license="MIT"
+maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b
+checksum=cd6815b8b9e0b98e284d3d732fb12162159cb9dcee4f45a7d4c0bd8b308a6794
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dc65a67c8bd4..c860376e7733 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,14 +1,13 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.08.0
+version=21.04.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
-depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=e2709a344307125f87153ea2e8bfa609f0a25bfa30e4758a81072027b16ca23e
+checksum=352bad532dfb0904d4fe9df67ab1b66731e71a23154d36c8f946ee71275db007
diff --git a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch b/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
deleted file mode 100644
index 2315031f0c1c..000000000000
--- a/srcpkgs/yambar/patches/0001-bar-fix-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7d94631991a5d530884664705341a4410ff45f74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Thu, 29 Jul 2021 15:57:00 -0300
-Subject: [PATCH] bar: fix typo.
-
-Running 'yambar --backend=wayland' would always error out saying it was
-built without wayland support.
----
- bar/bar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bar/bar.c b/bar/bar.c
-index 4829162..c7b1ea5 100644
---- a/bar/bar.c
-+++ b/bar/bar.c
-@@ -399,7 +399,7 @@ bar_new(const struct bar_config *config)
-         break;
- 
-     case BAR_BACKEND_WAYLAND:
--#if defined(BAR_WAYLAND)
-+#if defined(ENABLE_WAYLAND)
-         backend_data = bar_backend_wayland_new();
-         backend_iface = &wayland_backend_iface;
- #else
--- 
-2.32.0
-
diff --git a/srcpkgs/yambar/template b/srcpkgs/yambar/template
index 19167b33badb..a2608045b3ad 100644
--- a/srcpkgs/yambar/template
+++ b/srcpkgs/yambar/template
@@ -1,7 +1,7 @@
 # Template file for 'yambar'
 pkgname=yambar
 version=1.6.2
-revision=2
+revision=1
 wrksrc=$pkgname
 build_style=meson
 hostmakedepends="pkg-config scdoc wayland-devel"
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..50e3929b5862 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index b30773537d39..0b5aa770e7fb 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.4
+version=3.9.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=43b40ef07d55c53d02ad9ac388f42f65ec5ff277473c000766a2ab7d9664147c
+checksum=3af7ed1da914732db04762df9b3b799b9987cbeef315ff01f9dc5cf237582980
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 10190fa6f694..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,21 +1,22 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.3.7
+version=0.3.6
 revision=2
 build_style=meson
-configure_args="-Dlink-external=true"
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
- libjpeg-turbo-devel libjbig2dec gumbo-parser-devel"
+ libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+checksum=c6287d9201677a2ad580452820ecf19b7b4acdc8fd31b56fec595097e6197be4
 conflicts="zathura-pdf-poppler>=0"
 
+LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec"
+
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..19b3d771d895 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
-version=0.2.7
-revision=1
+version=0.2.6
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="http://pwmt.org/projects/zathura-ps/"
 distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+checksum=7eb085b41fc88979f997310b4e703455e6a81b6ef1ae7db0b6324b6f13c2cf73
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index bff3702aa131..f5b01ed0c425 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=7
+revision=6
 build_style=gnu-configure
 configure_args="
  --enable-python
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 153648a0ac40..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.14.0
+version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=15dfdcfbf35123c62551d515eb1c9f6e5235a8b502f9abfdb09746a163de1404
+checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 71628a6c079a..ef5b208e2db3 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.7.28991.0726
+version=5.7.26030.0627
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=003c35abc2dea55d3f27c28dca627ddfff69cdc2fe03dcaf1dda021770cc6cd9
+checksum=75b87639bebf3eaeb2de4c1ea3f47a9b76f6bcad1312a842dd4e9d40071024fa
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index c8c7ab2176e4..c9aa983cc2bf 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.7.3
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,7 +8,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=0b596cf8f86c51cc5aaf8914f8e47fdb0a60ba44e55d75a3d131b1f583ea098c
+checksum=12fa47e1258bb7794cc529a586603c9392b07c917b0fefb58a57fd68e6652c3b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/zsh-autosuggestions/template b/srcpkgs/zsh-autosuggestions/template
index 0e8e13b53325..668cccd4f349 100644
--- a/srcpkgs/zsh-autosuggestions/template
+++ b/srcpkgs/zsh-autosuggestions/template
@@ -1,18 +1,21 @@
 # Template file for 'zsh-autosuggestions'
 pkgname=zsh-autosuggestions
-version=0.7.0
-revision=1
-build_style=gnu-makefile
+version=0.6.4
+revision=2
 depends="zsh"
 short_desc="Fish-like autosuggestions for zsh"
 maintainer="vinnyA3 <vincent.aceto@gmail.com>"
 license="MIT"
 homepage="https://github.com/zsh-users/zsh-autosuggestions"
 distfiles="https://github.com/zsh-users/zsh-autosuggestions/archive/v${version}.tar.gz"
-checksum=ccd97fe9d7250b634683c651ef8a2fe3513ea917d1b491e8696a2a352b714f08
+checksum=0b6e251ced5fd7b5b78ea01f798ecc1b46169743a717567f0ec0a21198a372e8
+
+do_build() {
+	make
+}
 
 do_install() {
-	vinstall zsh-autosuggestions.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
-	vinstall zsh-autosuggestions.plugin.zsh 644 usr/share/zsh/plugins/zsh-autosuggestions
+	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense LICENSE
 }
diff --git a/xbps-src b/xbps-src
index 7fe0ac55ffd8..086a0fe212fc 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,10 +337,7 @@ setup_distfiles_mirror() {
             mkdir -p "$XBPS_MASTERDIR/$path"
             XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
         else
-            case "$XBPS_TARGET" in
-                fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
-                    msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
-            esac
+            msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
         fi
     done
 }
@@ -692,19 +689,18 @@ fi
 
 check_build_requirements
 
-#
-# Read funcs from helpers
-#
-for f in ${XBPS_SHUTILSDIR}/*.sh; do
-    [ -r "$f" ] && . $f
-done
-
 if [ -z "$IN_CHROOT" ]; then
     trap 'exit_func' INT TERM
     if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
         setup_distfiles_mirror
     fi
 fi
+#
+# Read funcs from helpers
+#
+for f in ${XBPS_SHUTILSDIR}/*.sh; do
+    [ -r "$f" ] && . $f
+done
 
 reconfigure_base_chroot
 

From 54ca51742c6b3835d2a709a5770d356b7d8bd15c Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sat, 21 Aug 2021 02:50:48 +0200
Subject: [PATCH 7/8] update to 2.0

---
 srcpkgs/libcgroup/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d490f3537ca6..d52b837b1c2e 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -9,8 +9,9 @@ short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/libcgroup/libcgroup"
-distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.bz2"
-checksum=11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7
+
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation

From ef978d81ce5f2bdb5ac067305fd8312c66e1590b Mon Sep 17 00:00:00 2001
From: na <na@na.na>
Date: Wed, 18 Aug 2021 05:31:51 +0200
Subject: [PATCH 8/8] libcgroup update version 2.o

checksum bz2 corrected

Revert "NO PUSH"

This reverts commit 66ce3b42f27177cffac4dbd985eff07b51c91373.

update to 2.0
---
 srcpkgs/libcgroup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d52b837b1c2e..94edbd76326a 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,7 +1,7 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2.0
-revision=1
+version=0.41
+revision=8
 build_style=gnu-configure
 hostmakedepends="flex"
 makedepends="pam-devel"

Re: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by wibed on void-packages repository

https://github.com/void-linux/void-packages/pull/32231#issuecomment-903210352

Comment:
ill reopen a new pr

Re: [PR PATCH] [Closed]: libcgroup: update to 2.0.

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]

There's a closed pull request on the void-packages repository

libcgroup: update to 2.0.
https://github.com/void-linux/void-packages/pull/32231

Description:
update libcgroup to version 2.0

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

[PR PATCH] libcgroup upgrade to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is a new pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup upgrade to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 1924 bytes --]

From b428a366d9be122b290e374649eb3916bf9eecca Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] upgrade to 2.0

---
 srcpkgs/libcgroup/template | 18 +++++++-----------
 srcpkgs/libcgroup/update   |  1 -
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..8fcf111224af 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 2524 bytes --]

From b428a366d9be122b290e374649eb3916bf9eecca Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH 1/2] upgrade to 2.0

---
 srcpkgs/libcgroup/template | 18 +++++++-----------
 srcpkgs/libcgroup/update   |  1 -
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..8fcf111224af 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

From e6f280625d2ff34d3064e530a924b1dbbbd2eb51 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH 2/2] upgrade to 2.0

---
 srcpkgs/libcgroup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index 8fcf111224af..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,6 +1,6 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=2
+version=2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 1941 bytes --]

From c7b103261e3ae3ca04df941f4df6bbee4a7371d9 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] upgrade to 2.0

upgrade to 2.0
---
 srcpkgs/libcgroup/template | 18 +++++++-----------
 srcpkgs/libcgroup/update   |  1 -
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 4609 bytes --]

From ec5cd87e952557b4c131f813265e8212cec99d90 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] upgrade to 2.0

upgrade to 2.0
---
 srcpkgs/libcgroup/patches/CVE-2018-14348.patch |  4 ++--
 .../patches/api.c-fix-infinite-loop.patch      |  4 ++--
 srcpkgs/libcgroup/patches/musl-decls.patch     |  4 ++--
 .../libcgroup/patches/musl-strerror_r.patch    |  4 ++--
 srcpkgs/libcgroup/template                     | 18 +++++++-----------
 srcpkgs/libcgroup/update                       |  1 -
 6 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
index bd083c2aad97..0aa1f906ff63 100644
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
@@ -1,5 +1,5 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
+--- src/daemon/cgrulesengd.c
++++ src/daemon/cgrulesengd.c
 @@ -889,9 +889,6 @@
  		} else if (pid > 0) {
  			exit(EXIT_SUCCESS);
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
index 12ee0eeebc84..13be3795dfd3 100644
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -11,8 +11,8 @@ to the next iteration.
 
 diff --git a/src/api.c b/src/api.c
 index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
+--- src/api.c
++++ src/api.c
 @@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
  			/* Get the group data. */
  			sp = &(rule->username[1]);
diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch
index eacf4e618d93..eaebdb8936c3 100644
--- a/srcpkgs/libcgroup/patches/musl-decls.patch
+++ b/srcpkgs/libcgroup/patches/musl-decls.patch
@@ -1,8 +1,8 @@
 In musl libc these macros are defined in the deprecated
 include file sys/cdefs.h
 
---- a/include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
-+++ b/include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
+--- include/libcgroup.h	2014-01-13 15:05:56.000000000 +0100
++++ include/libcgroup.h	2015-10-25 14:03:32.921207668 +0100
 @@ -16,6 +16,16 @@
  #ifndef _LIBCGROUP_H
  #define _LIBCGROUP_H
diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
index 0f54e12b05d2..eac640ba994f 100644
--- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch
+++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch
@@ -1,8 +1,8 @@
 The musl libc strerror_r(3) semantics are different from
 GNU libc's if _GNU_SOURCE is defined.
 
---- a/src/api.c	2014-01-13 15:05:56.000000000 +0100
-+++ b/src/api.c	2015-10-25 14:09:18.690232596 +0100
+--- src/api.c	2014-01-13 15:05:56.000000000 +0100
++++ src/api.c	2015-10-25 14:09:18.690232596 +0100
 @@ -3332,8 +3332,16 @@
  
  const char *cgroup_strerror(int code)
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 4049 bytes --]

From 55dd1ad81939d363f849f86b71bb6e8b141dbd49 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] removing deprecated patches

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/template                    | 18 ++++-----
 srcpkgs/libcgroup/update                      |  1 -
 4 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"

Re: [PR PATCH] [Updated] libcgroup: update to 2.0

[wibed]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

There is an updated pull request by wibed against master on the void-packages repository

https://github.com/wibed/void-packages libcgroupUpgrade
https://github.com/void-linux/void-packages/pull/32623

libcgroup: update to 2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ x] I built this PR locally for my native architecture, (ARCH-MUSL)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcgroupUpgrade-32623.patch --]
[-- Type: text/x-diff, Size: 4046 bytes --]

From d876a1996bc229cb0c1e6d8e1f0b9cea877cbb36 Mon Sep 17 00:00:00 2001
From: wibed <wibe@tutanota.com>
Date: Sun, 22 Aug 2021 06:25:48 +0200
Subject: [PATCH] libcgroup: update to 2.0

---
 .../libcgroup/patches/CVE-2018-14348.patch    | 12 ------
 .../patches/api.c-fix-infinite-loop.patch     | 38 -------------------
 srcpkgs/libcgroup/template                    | 18 ++++-----
 srcpkgs/libcgroup/update                      |  1 -
 4 files changed, 7 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/libcgroup/patches/CVE-2018-14348.patch
 delete mode 100644 srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
 delete mode 100644 srcpkgs/libcgroup/update

diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
deleted file mode 100644
index bd083c2aad97..000000000000
--- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@
- 		} else if (pid > 0) {
- 			exit(EXIT_SUCCESS);
- 		}
--
--		/* Change the file mode mask. */
--		umask(0);
- 	} else {
- 		flog(LOG_DEBUG, "Not using daemon mode\n");
- 		pid = getpid();<Paste>
diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
deleted file mode 100644
index 12ee0eeebc84..000000000000
--- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Date: Tue, 8 Dec 2015 16:53:41 +0100
-Subject: [PATCH] api.c: fix infinite loop
-
-If getgrnam or getpwuid functions failed, the program entered
-an infinite loop, because the rule pointer was never advanced.
-This is now fixed by updating the pointer before continuing
-to the next iteration.
----
- src/api.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/api.c b/src/api.c
-index d6c9d3a..ef796ac 100644
---- a/src/api.c
-+++ b/src/api.c
-@@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid,
- 			/* Get the group data. */
- 			sp = &(rule->username[1]);
- 			grp = getgrnam(sp);
--			if (!grp)
-+			if (!grp) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* Get the data for UID. */
- 			usr = getpwuid(uid);
--			if (!usr)
-+			if (!usr) {
-+				rule = rule->next;
- 				continue;
-+			}
- 
- 			/* If UID is a member of group, we matched. */
- 			for (i = 0; grp->gr_mem[i]; i++) {
--- 
-2.10.2
-
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index c9c19120e597..70dccea0068f 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -1,17 +1,16 @@
 # Template file for 'libcgroup'
 pkgname=libcgroup
-version=0.41
-revision=8
+version=2.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-pam-module-dir=/usr/lib/security"
-hostmakedepends="flex automake libtool"
+hostmakedepends="flex"
 makedepends="pam-devel"
 short_desc="Library that abstracts the control group file system in Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://libcg.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2"
-checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51
+license="LGPL-2.1-only"
+homepage="https://github.com/libcgroup/libcgroup"
+distfiles="https://github.com/libcgroup/libcgroup/releases/download/v${version}/libcgroup-${version}.tar.gz"
+checksum=aecc501a9ea6a97da0673585db5081df912ae607dec36d5f6f7ab14f69d48ab8
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Add musl-fts implementation
@@ -20,9 +19,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-pre_configure() {
-	autoreconf -if
-}
 post_configure() {
 	# Disable tests
 	sed -i Makefile -e "/SUBDIRS =/ s; tests;;"
diff --git a/srcpkgs/libcgroup/update b/srcpkgs/libcgroup/update
deleted file mode 100644
index d395a5b230c3..000000000000
--- a/srcpkgs/libcgroup/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="${pkgname}-v?\K[\d.]+(?=\.tar)"